diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-17 20:04:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 20:04:29 +0100 |
| commit | 0968c8d2f65f7ac6e0d6b3718ee1028b229b3353 (patch) | |
| tree | d2265ef6e3273658171104abe9b215f961d17495 /core/helper | |
| parent | 1feeb3e1c8406caf5497d5fcb40820cbb2d0d165 (diff) | |
| parent | d28763a4c1792dc00fde3d151eaea54f9cf2b8a9 (diff) | |
Merge pull request #12982 from tagcup/aabb_rename
Rename Rect3 to AABB.
Diffstat (limited to 'core/helper')
| -rw-r--r-- | core/helper/math_fieldwise.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/helper/math_fieldwise.cpp b/core/helper/math_fieldwise.cpp index 228611f8b3..2cd8a4f392 100644 --- a/core/helper/math_fieldwise.cpp +++ b/core/helper/math_fieldwise.cpp @@ -46,8 +46,8 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const switch (p_source.get_type()) { - /* clang-format makes a mess of this macro usage */ - /* clang-format off */ + /* clang-format makes a mess of this macro usage */ + /* clang-format off */ case Variant::VECTOR2: { @@ -106,9 +106,9 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const return target; } - case Variant::RECT3: { + case Variant::AABB: { - SETUP_TYPE(Rect3) + SETUP_TYPE(AABB) /**/ TRY_TRANSFER_FIELD("px", position.x) else TRY_TRANSFER_FIELD("py", position.y) |