summaryrefslogtreecommitdiff
path: root/scene/3d/remote_transform_3d.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-06-03 23:07:21 +0200
committerGitHub <noreply@github.com>2021-06-03 23:07:21 +0200
commit5d9cab3aeb3c62df6b7b44e6e68c0ebbb67f7a45 (patch)
tree619055aeb386211fb83a7c861ab0f79a34aedb2d /scene/3d/remote_transform_3d.cpp
parentea2a0b54554c09999d74212925322e8c7b2437e0 (diff)
parent0ac4051c00898b316ae11e7075d3f3a9e3c46be3 (diff)
Merge pull request #38430 from aaronfranke/transform3d
Diffstat (limited to 'scene/3d/remote_transform_3d.cpp')
-rw-r--r--scene/3d/remote_transform_3d.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/3d/remote_transform_3d.cpp b/scene/3d/remote_transform_3d.cpp
index 29a407905b..a7b3a6f1ec 100644
--- a/scene/3d/remote_transform_3d.cpp
+++ b/scene/3d/remote_transform_3d.cpp
@@ -65,7 +65,7 @@ void RemoteTransform3D::_update_remote() {
if (update_remote_position && update_remote_rotation && update_remote_scale) {
n->set_global_transform(get_global_transform());
} else {
- Transform our_trans = get_global_transform();
+ Transform3D our_trans = get_global_transform();
if (update_remote_rotation) {
n->set_rotation(our_trans.basis.get_rotation());
@@ -76,7 +76,7 @@ void RemoteTransform3D::_update_remote() {
}
if (update_remote_position) {
- Transform n_trans = n->get_global_transform();
+ Transform3D n_trans = n->get_global_transform();
n_trans.set_origin(our_trans.get_origin());
n->set_global_transform(n_trans);
@@ -87,7 +87,7 @@ void RemoteTransform3D::_update_remote() {
if (update_remote_position && update_remote_rotation && update_remote_scale) {
n->set_transform(get_transform());
} else {
- Transform our_trans = get_transform();
+ Transform3D our_trans = get_transform();
if (update_remote_rotation) {
n->set_rotation(our_trans.basis.get_rotation());
@@ -98,7 +98,7 @@ void RemoteTransform3D::_update_remote() {
}
if (update_remote_position) {
- Transform n_trans = n->get_transform();
+ Transform3D n_trans = n->get_transform();
n_trans.set_origin(our_trans.get_origin());
n->set_transform(n_trans);