diff options
| author | Juan Linietsky | 2015-12-04 10:19:58 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-12-04 10:19:58 -0300 |
| commit | bb392bde1608a837a00cc8972148031ae6d3331d (patch) | |
| tree | 92e8dda1f1dc08601927b364e0bd18fd8dfe3df6 /tools/editor/editor_node.cpp | |
| parent | da113fe40d0a9410859912473d53e43903dc6c8e (diff) | |
| parent | 145b8e52e6195208507f05f57ff97e4940a3a398 (diff) | |
| download | godot-bb392bde1608a837a00cc8972148031ae6d3331d.tar.gz godot-bb392bde1608a837a00cc8972148031ae6d3331d.tar.zst godot-bb392bde1608a837a00cc8972148031ae6d3331d.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor/editor_node.cpp')
| -rw-r--r-- | tools/editor/editor_node.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index b63dc9556..9ad517e57 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -1563,6 +1563,10 @@ void EditorNode::_edit_current() { scene_tree_dock->set_selected(NULL); property_editor->edit( NULL ); object_menu->set_disabled(true); + + if (editor_plugin_over) + editor_plugin_over->make_visible(false); + return; } |