asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #28392 from KoBeWi/reparent_alt

Browse source 
Allow to keep local transform when reparenting in editor
This commit is contained in:
Rémi Verschelde 2019-05-28 17:31:27 +02:00 committed by GitHub
commit b71254a861
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editor/scene_tree_dock.cpp
View file

@ -31,6 +31,7 @@
#include "scene_tree_dock.h" #include "scene_tree_dock.h"
#include "core/io/resource_saver.h" #include "core/io/resource_saver.h"
#include "core/os/input.h"
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
#include "core/project_settings.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; int to_pos = -1;
_normalize_drop(to_node, to_pos, p_type); _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) { void SceneTreeDock::_add_children_to_popup(Object *p_obj, int p_depth) {