diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
commit | eacb8f04c4697b8123afeec03088eebb3c4b20bd (patch) | |
tree | 8070f7807ec5d6a375df7184b151abbee8790608 /tools/editor/editor_node.h | |
parent | a75f8963380a1f6ae8501f21a1d3f3bef8a89d91 (diff) | |
parent | 4c4d79e3c98182faf348f41f98d1cc3e5d843e69 (diff) |
Merge remote-tracking branch 'origin/master'
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 5bd6ef0bdf..8c83d1b556 100644 --- a/tools/editor/editor_node.h +++ b/tools/editor/editor_node.h @@ -451,7 +451,7 @@ private: void _display_top_editors(bool p_display); void _set_top_editors(Vector<EditorPlugin*> p_editor_plugins_over); void _set_editing_top_editors(Object * p_current_object); - + void _quick_opened(); void _quick_run(); @@ -748,7 +748,7 @@ public: EditorPluginList(); ~EditorPluginList(); -} ; +} ; struct EditorProgressBG { |