diff options
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_assert.h | 8 | ||||
-rw-r--r-- | source/blender/blenlib/PIL_time.h | 11 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 6 |
3 files changed, 11 insertions, 14 deletions
diff --git a/source/blender/blenlib/BLI_assert.h b/source/blender/blenlib/BLI_assert.h index 44dc4324328..3d3c84d6370 100644 --- a/source/blender/blenlib/BLI_assert.h +++ b/source/blender/blenlib/BLI_assert.h @@ -94,13 +94,13 @@ extern "C" { #else /* older gcc, clang... */ /* Code adapted from http://www.pixelbeat.org/programming/gcc/static_assert.html */ /* Note we need the two concats below because arguments to ## are not expanded, so we need to - * expand __LINE__ with one indirection before doing the actual concatenation. */ + * expand __LINE__ with one indirection before doing the actual concatenation. */ # define _BLI_ASSERT_CONCAT_(a, b) a##b # define _BLI_ASSERT_CONCAT(a, b) _BLI_ASSERT_CONCAT_(a, b) /* This can't be used twice on the same line so ensure if using in headers - * that the headers are not included twice (by wrapping in #ifndef...#endif) - * Note it doesn't cause an issue when used on same line of separate modules - * compiled with gcc -combine -fwhole-program. */ + * that the headers are not included twice (by wrapping in #ifndef...#endif) + * Note it doesn't cause an issue when used on same line of separate modules + * compiled with gcc -combine -fwhole-program. */ # define BLI_STATIC_ASSERT(a, msg) \ ; \ enum { _BLI_ASSERT_CONCAT(assert_line_, __LINE__) = 1 / (int)(!!(a)) }; diff --git a/source/blender/blenlib/PIL_time.h b/source/blender/blenlib/PIL_time.h index 7d8983dea57..21ebc9d4b90 100644 --- a/source/blender/blenlib/PIL_time.h +++ b/source/blender/blenlib/PIL_time.h @@ -31,17 +31,14 @@ extern "C" { extern /** Return an indication of time, expressed as - * seconds since some fixed point. Successive calls - * are guaranteed to generate values greater than or - * equal to the last call. - */ + * seconds since some fixed point. Successive calls + * are guaranteed to generate values greater than or + * equal to the last call. */ double PIL_check_seconds_timer(void); extern - /** - * int version of #PIL_check_seconds_timer - */ + /** `int` version of #PIL_check_seconds_timer. */ long int PIL_check_seconds_timer_i(void); diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index af0a66503f2..668308581e7 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -1899,9 +1899,9 @@ bool isect_ray_tri_watertight_v3(const float ray_origin[3], const float t = (u * a_kz + v * b_kz + w * c_kz) * sz; const float sign_t = xor_fl(t, sign_det); if ((sign_t < 0.0f) - /* differ from Cycles, don't read r_lambda's original value - * otherwise we won't match any of the other intersect functions here... - * which would be confusing */ + /* Differ from Cycles, don't read r_lambda's original value + * otherwise we won't match any of the other intersect functions here... + * which would be confusing. */ #if 0 || (sign_T > *r_lambda * xor_signmask(det, sign_mask)) #endif |