File tree Expand file tree Collapse file tree 3 files changed +12
-6
lines changed
Expand file tree Collapse file tree 3 files changed +12
-6
lines changed Original file line number Diff line number Diff line change @@ -143,10 +143,12 @@ void Node2D::_update_transform() {
143143
144144void Node2D::reparent (Node *p_parent, bool p_keep_global_transform) {
145145 ERR_THREAD_GUARD;
146- Transform2D temp = get_global_transform ();
147- Node::reparent (p_parent);
148146 if (p_keep_global_transform) {
147+ Transform2D temp = get_global_transform ();
148+ Node::reparent (p_parent);
149149 set_global_transform (temp);
150+ } else {
151+ Node::reparent (p_parent);
150152 }
151153}
152154
Original file line number Diff line number Diff line change @@ -719,10 +719,12 @@ void Node3D::set_disable_gizmos(bool p_enabled) {
719719
720720void Node3D::reparent (Node *p_parent, bool p_keep_global_transform) {
721721 ERR_THREAD_GUARD;
722- Transform3D temp = get_global_transform ();
723- Node::reparent (p_parent);
724722 if (p_keep_global_transform) {
723+ Transform3D temp = get_global_transform ();
724+ Node::reparent (p_parent);
725725 set_global_transform (temp);
726+ } else {
727+ Node::reparent (p_parent);
726728 }
727729}
728730
Original file line number Diff line number Diff line change @@ -188,10 +188,12 @@ Size2 Control::_edit_get_minimum_size() const {
188188
189189void Control::reparent (Node *p_parent, bool p_keep_global_transform) {
190190 ERR_MAIN_THREAD_GUARD;
191- Transform2D temp = get_global_transform ();
192- Node::reparent (p_parent);
193191 if (p_keep_global_transform) {
192+ Transform2D temp = get_global_transform ();
193+ Node::reparent (p_parent);
194194 set_global_position (temp.get_origin ());
195+ } else {
196+ Node::reparent (p_parent);
195197 }
196198}
197199
You can’t perform that action at this time.
0 commit comments