diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-26 17:23:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 17:23:11 +0100 |
| commit | 5f1107aa30295e686be6f41cb6d17fc2cff1e036 (patch) | |
| tree | 7bce4c680e6686c9d29be8b479be5b39205ce7a3 /editor/plugins/spatial_editor_plugin.h | |
| parent | a2da99f40cf2123c0906c734a2eb01e9b65a45a2 (diff) | |
| parent | be07f86f85ab70a48b310b42faa64e72a74ca694 (diff) | |
Merge pull request #37317 from akien-mga/display-server-rebased
Separate DisplayServer from OS and add multiple windows support
Diffstat (limited to 'editor/plugins/spatial_editor_plugin.h')
| -rw-r--r-- | editor/plugins/spatial_editor_plugin.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index b67459b9d0..9dad66b647 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -262,7 +262,7 @@ private: PopupMenu *display_submenu; Control *surface; - Viewport *viewport; + SubViewport *viewport; Camera *camera; bool transforming; bool orthogonal; @@ -467,7 +467,7 @@ public: AABB *p_preview_bounds, AcceptDialog *p_accept); - Viewport *get_viewport_node() { return viewport; } + SubViewport *get_viewport_node() { return viewport; } Camera *get_camera() { return camera; } // return the default camera object. SpatialEditorViewport(SpatialEditor *p_spatial_editor, EditorNode *p_editor, int p_index); |