summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-09-05 17:38:57 +0200
committerGitHub <noreply@github.com>2019-09-05 17:38:57 +0200
commit4ee8ecd3efee742be58c1ff191e78d0de09b57b6 (patch)
tree27a3bd82d5b796aaa70a79e05bdc23faa6bb2849
parent768d637a1bc94a0a6a9b4ea2eb50e2c8197be3ab (diff)
parent2bac4e17840181db274810e1721e25a8e057aacd (diff)
Merge pull request #31989 from sparkart/revert-30833-fix_inspector_clear_remote_node
Revert "Fix Clearing Inspector for Remote Node"
-rw-r--r--editor/editor_path.cpp3
-rw-r--r--editor/script_editor_debugger.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp
index 23d28261d1..12510e27de 100644
--- a/editor/editor_path.cpp
+++ b/editor/editor_path.cpp
@@ -78,9 +78,6 @@ 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 cf54b5c0d1..6ee09012a5 100644
--- a/editor/script_editor_debugger.cpp
+++ b/editor/script_editor_debugger.cpp
@@ -1409,7 +1409,7 @@ void ScriptEditorDebugger::stop() {
profiler->set_enabled(true);
inspect_scene_tree->clear();
- EditorNode::get_singleton()->edit_current();
+ inspector->edit(NULL);
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();