summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsanikoyes <sanikoyes@163.com>2014-05-08 16:24:52 +0800
committersanikoyes <sanikoyes@163.com>2014-05-08 16:24:52 +0800
commit6bc556dee58b6cda0bd5805c1d2bb4f99200f8f7 (patch)
tree869f6bd1ec192fd39ddbd36ef4a924d9dbcfad27
parent2495df4ffce5ed3f9d94e0d10801fa6bb6cfba19 (diff)
Fix crash in editor when open new scene in editing
resources_dock->cleanup(); // This will delete GDScript instance (if property_editor->obj is scene's GDScript instance, editor will crash)
-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 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) {