diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-12-07 09:18:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-07 09:18:11 +0100 |
commit | 96dbf19093cfc88aa688d4321fd07c2fb9afb259 (patch) | |
tree | d5d31273dc27f2a864bdf8620ddd2fe0a8facff5 /core/helper | |
parent | 5e19fac9872e8ba24a65bf6f9de2fdf9fa360358 (diff) | |
parent | 13c2ff932089db24841bb971b645141218bd8586 (diff) |
Merge pull request #14332 from akien-mga/clang-format
Update style for clang-format 5.0.0, new min required version
Diffstat (limited to 'core/helper')
-rw-r--r-- | core/helper/math_fieldwise.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/helper/math_fieldwise.cpp b/core/helper/math_fieldwise.cpp index 2cd8a4f392..9e5eab2ee8 100644 --- a/core/helper/math_fieldwise.cpp +++ b/core/helper/math_fieldwise.cpp @@ -44,10 +44,10 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const ERR_FAIL_COND_V(p_target.get_type() != p_source.get_type(), p_target); - 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 */ + switch (p_source.get_type()) { case Variant::VECTOR2: { @@ -174,9 +174,8 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const default: { ERR_FAIL_V(p_target); } - - /* clang-format on */ } + /* clang-format on */ } #endif // TOOLS_ENABLED |