diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2021-10-28 15:57:41 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2021-10-28 15:57:41 +0200 |
| commit | 0ae65472e71324b3bb0fb43038630d31e700e562 (patch) | |
| tree | ca5f536016191d0e25a068bb5434ddf344b571a6 /scene/3d/node_3d.cpp | |
| parent | 3a6be64c12a3ba8edb646d5362c34de1a5fcc0bf (diff) | |
clang-format: Enable `BreakBeforeTernaryOperators`
clang-format keeps breaking the way it handles break *after* ternary operators,
so I give up and go with the only style they seem to actually test.
Diffstat (limited to 'scene/3d/node_3d.cpp')
| -rw-r--r-- | scene/3d/node_3d.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp index 438c65f502..1265679b36 100644 --- a/scene/3d/node_3d.cpp +++ b/scene/3d/node_3d.cpp @@ -94,11 +94,6 @@ void Node3D::_propagate_transform_changed(Node3D *p_origin) { return; } - /* - if (data.dirty&DIRTY_GLOBAL) - return; //already dirty - */ - data.children_lock++; for (Node3D *&E : data.children) { @@ -244,10 +239,9 @@ Quaternion Node3D::get_quaternion() const { } void Node3D::set_global_transform(const Transform3D &p_transform) { - Transform3D xform = - (data.parent && !data.top_level_active) ? - data.parent->get_global_transform().affine_inverse() * p_transform : - p_transform; + Transform3D xform = (data.parent && !data.top_level_active) + ? data.parent->get_global_transform().affine_inverse() * p_transform + : p_transform; set_transform(xform); } |