diff options
| author | Juan Linietsky | 2016-10-05 01:26:35 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-10-05 01:26:35 -0300 |
| commit | cf5778e51a883936ffc896231da8259e5ebabc0a (patch) | |
| tree | 286f7eb7956a5c2c275276bbc9e3db5e3ff0730f /tools/editor/editor_node.h | |
| parent | a6e9dc615346f44b68b418483dd218d11ba4a674 (diff) | |
| download | godot-cf5778e51a883936ffc896231da8259e5ebabc0a.tar.gz godot-cf5778e51a883936ffc896231da8259e5ebabc0a.tar.zst godot-cf5778e51a883936ffc896231da8259e5ebabc0a.zip | |
-Added ViewportContainer, this is the only way to make viewports show up in GUI now
-2D editing now seems to work
-Added some functions and refactoring to Viewport
Diffstat (limited to 'tools/editor/editor_node.h')
| -rw-r--r-- | tools/editor/editor_node.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h index 0393cd19a..c5271860e 100644 --- a/tools/editor/editor_node.h +++ b/tools/editor/editor_node.h @@ -79,7 +79,7 @@ #include "fileserver/editor_file_server.h" #include "editor_resource_preview.h" - +#include "scene/gui/viewport_container.h" #include "progress_dialog.h" @@ -207,7 +207,7 @@ private: //Ref<ResourceImportMetadata> scene_import_metadata; - Control* scene_root_parent; + PanelContainer* scene_root_parent; Control *gui_base; VBoxContainer *main_vbox; |