diff options
| author | reduz <reduzio@gmail.com> | 2014-05-08 10:32:35 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2014-05-08 10:32:35 -0300 |
| commit | 9f01f9aa952509a0453ed24474cbe66eefbb08a4 (patch) | |
| tree | f86fb838c14c180277ee185ae6e07e79236d5d43 /tools/editor | |
| parent | 76d44e9dbcae6797b8814e13be0e5f8aa875fbb4 (diff) | |
| parent | 6bc556dee58b6cda0bd5805c1d2bb4f99200f8f7 (diff) | |
Merge pull request #383 from sanikoyes/hotfix-Crash-In-Editor
Fix crash in editor when open new scene in editing
Diffstat (limited to 'tools/editor')
| -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 3ef523a695..fc644e76c5 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -1569,8 +1569,8 @@ void EditorNode::_cleanup_scene() { editor_history.clear(); _hide_top_editors(); animation_editor->cleanup(); - resources_dock->cleanup(); property_editor->edit(NULL); + resources_dock->cleanup(); scene_import_metadata.unref(); set_edited_scene(NULL); if (scene) { |