godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15571 from RandomShaper/fix-crash-save-branch

Browse Source 
Fix crash on save-branch-as-scene
This commit is contained in:
Rémi Verschelde 2018-01-11 15:47:07 +01:00 committed by GitHub
commit 920715b97d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/scene_tree_dock.cpp
View File

@ -237,13 +237,20 @@ void SceneTreeDock::_replace_with_branch_scene(const String &p_file, Node *base)
Node *parent = base->get_parent(); Node *parent = base->get_parent();
int pos = base->get_index(); int pos = base->get_index();
memdelete(base); parent->remove_child(base);
parent->add_child(instanced_scene); parent->add_child(instanced_scene);
parent->move_child(instanced_scene, pos); parent->move_child(instanced_scene, pos);
instanced_scene->set_owner(edited_scene); instanced_scene->set_owner(edited_scene);
editor_selection->clear(); editor_selection->clear();
editor_selection->add_node(instanced_scene); editor_selection->add_node(instanced_scene);
scene_tree->set_selected(instanced_scene); scene_tree->set_selected(instanced_scene);
// Delete the node as late as possible because before another one is selected
// an editor plugin could be referencing it to do something with it before
// switching to another (or to none); and since some steps of changing the
// editor state are deferred, the safest thing is to do this is as the last
// step of this function and also by enqueing instead of memdelete()-ing it here
base->queue_delete();
} }
bool SceneTreeDock::_cyclical_dependency_exists(const String &p_target_scene_path, Node *p_desired_node) { bool SceneTreeDock::_cyclical_dependency_exists(const String &p_target_scene_path, Node *p_desired_node) {