diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-29 10:33:22 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-29 10:33:22 -0300 |
| commit | 119cd5d3ff9fbbafc59db7481c0eee29f43c0c64 (patch) | |
| tree | 9ef6307495d76f0fd58dd7b2e1575190201dddb5 | |
| parent | 72ab3c22367c98735cc97402447b862b59b8557e (diff) | |
| parent | cd60c11229b7bf04a994ae7ccf7463a3e586dd41 (diff) | |
Merge pull request #5479 from volzhs/fix-show-main-panel
Fix main(2D, 3D, Script) panel not updated when start up and select f…
| -rw-r--r-- | tools/editor/editor_node.cpp | 2 |
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 "); |