diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-03 15:53:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 15:53:35 +0200 |
| commit | 59d44ee872cc7da1e6f85943b2d08e32c65c01e1 (patch) | |
| tree | 5a9b6fb475d31eee1903a85ee1188b4bfff0e12e /editor/plugins/material_editor_plugin.cpp | |
| parent | d9a560d7832af7f1ff845ed2b3a81b65741f9abe (diff) | |
| parent | 0c6851ae53c1c7b7aff743d05c658cb28e1af576 (diff) | |
Merge pull request #37505 from YeldhamDev/viewcont_rename
Rename ViewportContainer to SubViewportContainer
Diffstat (limited to 'editor/plugins/material_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/material_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index 5623805201..00e8a05e4e 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "material_editor_plugin.h" #include "editor/editor_scale.h" -#include "scene/gui/viewport_container.h" +#include "scene/gui/subviewport_container.h" #include "scene/resources/particles_material.h" #include "scene/resources/sky_material.h" @@ -110,7 +110,7 @@ void MaterialEditor::_bind_methods() { MaterialEditor::MaterialEditor() { - vc = memnew(ViewportContainer); + vc = memnew(SubViewportContainer); vc->set_stretch(true); add_child(vc); vc->set_anchors_and_margins_preset(PRESET_WIDE); |