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 /scene/register_scene_types.cpp | |
| parent | d9a560d7832af7f1ff845ed2b3a81b65741f9abe (diff) | |
| parent | 0c6851ae53c1c7b7aff743d05c658cb28e1af576 (diff) | |
| download | redot-engine-59d44ee872cc7da1e6f85943b2d08e32c65c01e1.tar.gz | |
Merge pull request #37505 from YeldhamDev/viewcont_rename
Rename ViewportContainer to SubViewportContainer
Diffstat (limited to 'scene/register_scene_types.cpp')
| -rw-r--r-- | scene/register_scene_types.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index e11abb5fba..94162cbe4e 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -110,6 +110,7 @@ #include "scene/gui/slider.h" #include "scene/gui/spin_box.h" #include "scene/gui/split_container.h" +#include "scene/gui/subviewport_container.h" #include "scene/gui/tab_container.h" #include "scene/gui/tabs.h" #include "scene/gui/text_edit.h" @@ -119,7 +120,6 @@ #include "scene/gui/tool_button.h" #include "scene/gui/tree.h" #include "scene/gui/video_player.h" -#include "scene/gui/viewport_container.h" #include "scene/main/canvas_item.h" #include "scene/main/canvas_layer.h" #include "scene/main/http_request.h" @@ -357,7 +357,7 @@ void register_scene_types() { ClassDB::register_class<ConfirmationDialog>(); ClassDB::register_class<MarginContainer>(); - ClassDB::register_class<ViewportContainer>(); + ClassDB::register_class<SubViewportContainer>(); ClassDB::register_virtual_class<SplitContainer>(); ClassDB::register_class<HSplitContainer>(); ClassDB::register_class<VSplitContainer>(); @@ -842,6 +842,7 @@ void register_scene_types() { ClassDB::add_compatibility_class("StaticBody", "StaticBody3D"); ClassDB::add_compatibility_class("VehicleBody", "VehicleBody3D"); ClassDB::add_compatibility_class("VehicleWheel", "VehicleWheel3D"); + ClassDB::add_compatibility_class("ViewportContainer", "SubViewportContainer"); ClassDB::add_compatibility_class("VisibilityEnabler", "VisibilityEnabler3D"); ClassDB::add_compatibility_class("VisibilityNotifier", "VisibilityNotifier3D"); ClassDB::add_compatibility_class("VisualServer", "RenderingServer"); |