diff options
| author | Rémi Verschelde | 2018-05-31 08:58:37 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2018-05-31 09:00:37 +0200 |
| commit | 43b7ebf0a0478d7b04620b03920fd82041afb588 (patch) | |
| tree | 0532156ef2bdeac7cd461ffc2014ee75bd25f2a0 /core | |
| parent | e823a366d02cdcd8ac48f635eeb6127962aeeb2a (diff) | |
| download | godot-43b7ebf0a0478d7b04620b03920fd82041afb588.tar.gz godot-43b7ebf0a0478d7b04620b03920fd82041afb588.tar.zst godot-43b7ebf0a0478d7b04620b03920fd82041afb588.zip | |
Diffstat (limited to 'core')
| -rw-r--r-- | core/color_names.inc | 2 | ||||
| -rw-r--r-- | core/error_macros.h | 16 | ||||
| -rw-r--r-- | core/math/matrix3.cpp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/core/color_names.inc b/core/color_names.inc index b05684acc..3ae42648d 100644 --- a/core/color_names.inc +++ b/core/color_names.inc @@ -3,7 +3,7 @@ static Map<String, Color> _named_colors; static void _populate_named_colors() { - if(!_named_colors.empty()) return; + if (!_named_colors.empty()) return; _named_colors.insert("aliceblue", Color(0.94, 0.97, 1.00)); _named_colors.insert("antiquewhite", Color(0.98, 0.92, 0.84)); _named_colors.insert("aqua", Color(0.00, 1.00, 1.00)); diff --git a/core/error_macros.h b/core/error_macros.h index 168b2e06f..3587e01d5 100644 --- a/core/error_macros.h +++ b/core/error_macros.h @@ -311,14 +311,14 @@ extern bool _err_error_exists; _err_error_exists = false; \ } -#define WARN_DEPRECATED \ - { \ - static bool warning_shown=false;\ - if (!warning_shown) {\ - _err_print_error(FUNCTION_STR, __FILE__, __LINE__,"This method has been deprecated and will be removed in the future", ERR_HANDLER_WARNING); \ - _err_error_exists = false; \ - warning_shown=true;\ - }\ +#define WARN_DEPRECATED \ + { \ + static bool warning_shown = false; \ + if (!warning_shown) { \ + _err_print_error(FUNCTION_STR, __FILE__, __LINE__, "This method has been deprecated and will be removed in the future", ERR_HANDLER_WARNING); \ + _err_error_exists = false; \ + warning_shown = true; \ + } \ } #endif diff --git a/core/math/matrix3.cpp b/core/math/matrix3.cpp index 8ee8ccb45..202115e2c 100644 --- a/core/math/matrix3.cpp +++ b/core/math/matrix3.cpp @@ -828,7 +828,7 @@ void Basis::set_diagonal(const Vector3 p_diag) { } Basis Basis::slerp(const Basis &target, const real_t &t) const { - // TODO: implement this directly without using quaternions to make it more efficient +// TODO: implement this directly without using quaternions to make it more efficient #ifdef MATH_CHECKS ERR_FAIL_COND_V(is_rotation() == false, Basis()); ERR_FAIL_COND_V(target.is_rotation() == false, Basis()); |