diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-13 14:38:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 14:38:56 +0200 |
| commit | 85e315d6e8ffd117404473fe4f96476e38237c1e (patch) | |
| tree | 46db199a594762bb8881c1ae0edde92ab4f97d8c /editor | |
| parent | 1833c8b23335015f32aa2f6c31926aae597494d0 (diff) | |
| parent | eb4902a4558f286b3f26559c217614d075879d53 (diff) | |
Merge pull request #51607 from aaronfranke/includes
Fix some unnecessary includes
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 7fe12089c8..eac5c7abf2 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -6160,7 +6160,7 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasIte editor = p_node; editor_data = editor->get_scene_tree_dock()->get_editor_data(); canvas_item_editor = p_canvas_item_editor; - preview_node = memnew(Node2D); + preview_node = memnew(Control); accept = memnew(AcceptDialog); editor->get_gui_base()->add_child(accept); diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index 495cd5f515..e951183dea 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -649,7 +649,7 @@ class CanvasItemEditorViewport : public Control { EditorNode *editor; EditorData *editor_data; CanvasItemEditor *canvas_item_editor; - Node2D *preview_node; + Control *preview_node; AcceptDialog *accept; AcceptDialog *selector; Label *selector_label; |