summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-05-28 17:31:27 +0200
committerGitHub <noreply@github.com>2019-05-28 17:31:27 +0200
commitb71254a86134233949ee9ebe5855fa509f34824c (patch)
tree3a08b924b05d1def28468d320a275d8ecc767a0f
parent06633a8074b1695e0f84755275b20adc2df827a6 (diff)
parent9dba47a743b6ae75f63fbc0c08f6be27c030be0f (diff)
Merge pull request #28392 from KoBeWi/reparent_alt
Allow to keep local transform when reparenting in editor
-rw-r--r--editor/scene_tree_dock.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 8107dee1d4..a2c142d928 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"
@@ -2126,7 +2127,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) {