summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Barroga <emmanuelbarroga@gmail.com>2019-07-25 22:10:49 -0700
committerEmmanuel Barroga <emmanuelbarroga@gmail.com>2019-07-25 22:10:49 -0700
commit2f2abadefe91ad3fb1c81be46f4573988b8226be (patch)
treec25ac0c80f12293bdb8973e18e30e66968b82fdb
parentd483a85a0ff4462fe7bff5d5ff6ea69c66cab417 (diff)
Fix Clearing Inspector for Remote Node
Resolves: #30731 When you stop debugging... if you were inspecting a remote node, partial information about the remote node remained in the inspector (e.g. name and warning). To resolve this, called EditorNode::edit_current() instead of EditorInspector::edit(NULL), which will call all the methods required using "NULL" if the current selected object is NULL. In EditorPath::update_path() if the selected object is NULL, it does not update the path to reflect this change, basically does nothing. To fix this, we nullify everything, before the history loop.
-rw-r--r--editor/editor_path.cpp3
-rw-r--r--editor/script_editor_debugger.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp
index 12510e27de..23d28261d1 100644
--- a/editor/editor_path.cpp
+++ b/editor/editor_path.cpp
@@ -78,6 +78,9 @@ void EditorPath::_about_to_show() {
}
void EditorPath::update_path() {
+ set_text("");
+ set_tooltip("");
+ set_icon(NULL);
for (int i = 0; i < history->get_path_size(); i++) {
diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp
index a749509ce4..6a10ce1c99 100644
--- a/editor/script_editor_debugger.cpp
+++ b/editor/script_editor_debugger.cpp
@@ -1369,7 +1369,7 @@ void ScriptEditorDebugger::stop() {
profiler->set_enabled(true);
inspect_scene_tree->clear();
- inspector->edit(NULL);
+ EditorNode::get_singleton()->edit_current();
EditorNode::get_singleton()->get_pause_button()->set_pressed(false);
EditorNode::get_singleton()->get_pause_button()->set_disabled(true);
EditorNode::get_singleton()->get_scene_tree_dock()->hide_remote_tree();