diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-13 16:10:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 16:10:44 +0100 |
| commit | 0b409d89d04d4cfed9fb559df8a3b379aba6ea2b (patch) | |
| tree | 4e753cc811a27180dc88d7fadfdb1cf937b799ac /scene/3d/node_3d.cpp | |
| parent | 59495adb7c4b4dc2374a4a4d8cd0360ccf293a32 (diff) | |
| parent | af878716f2620fb9142b960253dc82f60ab23df2 (diff) | |
| download | redot-engine-0b409d89d04d4cfed9fb559df8a3b379aba6ea2b.tar.gz | |
Merge pull request #45136 from akien-mga/clang-format-11
CI: Update to clang-format 11 and apply ternary operator changes
Diffstat (limited to 'scene/3d/node_3d.cpp')
| -rw-r--r-- | scene/3d/node_3d.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp index 503dd5735b..2a49e60669 100644 --- a/scene/3d/node_3d.cpp +++ b/scene/3d/node_3d.cpp @@ -239,8 +239,8 @@ void Node3D::set_transform(const Transform &p_transform) { void Node3D::set_global_transform(const Transform &p_transform) { Transform xform = (data.parent && !data.top_level_active) ? - data.parent->get_global_transform().affine_inverse() * p_transform : - p_transform; + data.parent->get_global_transform().affine_inverse() * p_transform : + p_transform; set_transform(xform); } |