diff options
author | Tomasz Chabora <kobewi4e@gmail.com> | 2019-04-24 14:49:00 +0200 |
---|---|---|
committer | Tomasz Chabora <kobewi4e@gmail.com> | 2019-04-29 19:24:12 +0200 |
commit | 9dba47a743b6ae75f63fbc0c08f6be27c030be0f (patch) | |
tree | ae6f7b054107f3bd6e6515f4965433c8cf4947dd | |
parent | e1d16e722ec9742c3f92d20dc433d540339c36e6 (diff) |
Allow to keep local transform when reparenting
-rw-r--r-- | editor/scene_tree_dock.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 1dca542138..c5c343a83d 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -31,6 +31,7 @@ #include "scene_tree_dock.h" #include "core/io/resource_saver.h" +#include "core/os/input.h" #include "core/os/keyboard.h" #include "core/project_settings.h" @@ -2130,7 +2131,7 @@ void SceneTreeDock::_nodes_dragged(Array p_nodes, NodePath p_to, int p_type) { int to_pos = -1; _normalize_drop(to_node, to_pos, p_type); - _do_reparent(to_node, to_pos, nodes, true); + _do_reparent(to_node, to_pos, nodes, !Input::get_singleton()->is_key_pressed(KEY_SHIFT)); } void SceneTreeDock::_add_children_to_popup(Object *p_obj, int p_depth) { |