summaryrefslogtreecommitdiffstats
path: root/scene/3d/node_3d.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/3d/node_3d.cpp')
-rw-r--r--scene/3d/node_3d.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp
index ab058b5646..5c081a0b47 100644
--- a/scene/3d/node_3d.cpp
+++ b/scene/3d/node_3d.cpp
@@ -719,10 +719,12 @@ void Node3D::set_disable_gizmos(bool p_enabled) {
void Node3D::reparent(Node *p_parent, bool p_keep_global_transform) {
ERR_THREAD_GUARD;
- Transform3D temp = get_global_transform();
- Node::reparent(p_parent);
if (p_keep_global_transform) {
+ Transform3D temp = get_global_transform();
+ Node::reparent(p_parent);
set_global_transform(temp);
+ } else {
+ Node::reparent(p_parent);
}
}