diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-06-08 08:10:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 08:10:46 +0200 |
| commit | a6c9b11de13181d02c67e23fdfb9ded72cb45669 (patch) | |
| tree | c5c13eca1bc0055a85a04e0a4a4ea21c7c66eb05 /editor | |
| parent | 2db0c615dd71788f35db03854919a8cad384c4d0 (diff) | |
| parent | cad3c41a91f139b4602d09bd3cd1dcf6332030d1 (diff) | |
Merge pull request #19437 from volzhs/live-edit-reparent-child
Make same child index as edited scene when using live edit
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/scene_tree_dock.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index d6dd71e74b..77ee65879b 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -1248,7 +1248,7 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V path_renames[ni].second = fixed_node_path; } - editor_data->get_undo_redo().add_do_method(sed, "live_debug_reparent_node", edited_scene->get_path_to(node), edited_scene->get_path_to(new_parent), new_name, -1); + editor_data->get_undo_redo().add_do_method(sed, "live_debug_reparent_node", edited_scene->get_path_to(node), edited_scene->get_path_to(new_parent), new_name, p_position_in_parent + inc); editor_data->get_undo_redo().add_undo_method(sed, "live_debug_reparent_node", NodePath(String(edited_scene->get_path_to(new_parent)) + "/" + new_name), edited_scene->get_path_to(node->get_parent()), node->get_name(), node->get_index()); if (p_keep_global_xform) { |