summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorvolzhs <volzhs@gmail.com>2016-06-29 14:49:03 +0900
committervolzhs <volzhs@gmail.com>2016-06-29 14:49:03 +0900
commitcd60c11229b7bf04a994ae7ccf7463a3e586dd41 (patch)
treeb7cc108c71b5b02f0fc579c5e237e5b70a85b769 /tools/editor
parentea108bed7941725b1da2e0e28d7c8dc23f4fff70 (diff)
Fix main(2D, 3D, Script) panel not updated when start up and select from tool button
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/editor_node.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 9e897a41d9..2bba97251d 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -3431,7 +3431,7 @@ Dictionary EditorNode::_get_main_scene_state() {
void EditorNode::_set_main_scene_state(Dictionary p_state,Node* p_for_scene) {
- if (get_edited_scene()!=p_for_scene)
+ if (get_edited_scene()!=p_for_scene && p_for_scene!=NULL)
return; //not for this scene
//print_line("set current 7 ");