From 6bc556dee58b6cda0bd5805c1d2bb4f99200f8f7 Mon Sep 17 00:00:00 2001 From: sanikoyes Date: Thu, 8 May 2014 16:24:52 +0800 Subject: [PATCH] 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) --- tools/editor/editor_node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 3ef523a6951..fc644e76c58 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) {