diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-11-19 00:22:53 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-19 00:22:53 -0300 |
commit | fe449a6235b1939f97f61aa2c1f2cddc56af5f9f (patch) | |
tree | b2fb68c17f2b6722a7adfb7cc58c279ce5c49eb3 | |
parent | 2dac9ab2ef7ac9e015ef577f7ec0704f50cf6670 (diff) | |
parent | b3e60585c23bea1787ce3553408927d68edb25b0 (diff) |
Merge pull request #2445 from TheHX/issue_2113
Possible fix for crash on replacing Path2D node (#2113)
-rw-r--r-- | tools/editor/scene_tree_dock.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index 08aa68d792..0cafe7459b 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -1223,24 +1223,21 @@ void SceneTreeDock::_create() { } - String newname=n->get_name(); n->replace_by(newnode,true); - if (n==edited_scene) { edited_scene=newnode; editor->set_edited_scene(newnode); } - - - editor_data->get_undo_redo().clear_history(); - memdelete(n); newnode->set_name(newname); + editor->push_item(newnode); + memdelete(n); + _update_tool_buttons(); } |