diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-04 16:37:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 16:37:40 +0200 |
| commit | 878adb22b72d3442c7edd7de9a9b3f0348524d2f (patch) | |
| tree | 0e4fd619aafd0d6a99c37707f75f9dfb1d6107d5 /editor/plugins/material_editor_plugin.cpp | |
| parent | 560510b93b0c4b4dc40ce0599695504c4b2155fb (diff) | |
| parent | 559bc3ca87042d477331ecd32f1881ce8d0b5d91 (diff) | |
Merge pull request #37717 from qarmin/world_fix
Change non-existent World to World3D
Diffstat (limited to 'editor/plugins/material_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/material_editor_plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index eb14495b9c..f63bcb69b8 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -117,9 +117,9 @@ MaterialEditor::MaterialEditor() { add_child(vc); vc->set_anchors_and_margins_preset(PRESET_WIDE); viewport = memnew(SubViewport); - Ref<World3D> world; - world.instance(); - viewport->set_world(world); //use own world + Ref<World3D> world_3d; + world_3d.instance(); + viewport->set_world_3d(world_3d); //use own world vc->add_child(viewport); viewport->set_disable_input(true); viewport->set_transparent_background(true); |