diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-13 21:11:09 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-13 21:11:09 +0400 |
commit | 8b2c5e693c134cc5eb7d9a2da4f5d40cc06636ec (patch) | |
tree | 7b0888adc1ddd73d4222da5a1aa9377772adc70e /source/blender/blenlib | |
parent | bb61b4628039c0d3162182801666ac0df99e6165 (diff) |
Fix #35634: weight paint did not do z-buffer culling anymore on Windows after recent change to size of bool.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_math_vector.h | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_vector_inline.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index 17c69d22337..0df4de1f829 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -149,14 +149,14 @@ MINLINE void star_m3_v3(float rmat[3][3], float a[3]); MINLINE float len_squared_v2(const float v[2]); MINLINE float len_squared_v3(const float v[3]); MINLINE float len_manhattan_v2(const float v[2]); -MINLINE float len_manhattan_v2_int(const int v[2]); +MINLINE int len_manhattan_v2_int(const int v[2]); MINLINE float len_manhattan_v3(const float v[3]); MINLINE float len_v2(const float a[2]); MINLINE float len_v2v2(const float a[2], const float b[2]); MINLINE float len_squared_v2v2(const float a[2], const float b[2]); MINLINE float len_squared_v3v3(const float a[3], const float b[3]); MINLINE float len_manhattan_v2v2(const float a[2], const float b[2]); -MINLINE float len_manhattan_v2v2_int(const int a[2], const int b[2]); +MINLINE int len_manhattan_v2v2_int(const int a[2], const int b[2]); MINLINE float len_manhattan_v3v3(const float a[3], const float b[3]); MINLINE float len_v3(const float a[3]); MINLINE float len_v3v3(const float a[3], const float b[3]); diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c index 216057f79c5..d77b1ecf017 100644 --- a/source/blender/blenlib/intern/math_vector_inline.c +++ b/source/blender/blenlib/intern/math_vector_inline.c @@ -594,7 +594,7 @@ MINLINE float len_manhattan_v2(const float v[2]) return fabsf(v[0]) + fabsf(v[1]); } -MINLINE float len_manhattan_v2_int(const int v[2]) +MINLINE int len_manhattan_v2_int(const int v[2]) { return ABS(v[0]) + ABS(v[1]); } @@ -647,7 +647,7 @@ MINLINE float len_manhattan_v2v2(const float a[2], const float b[2]) return len_manhattan_v2(d); } -MINLINE float len_manhattan_v2v2_int(const int a[2], const int b[2]) +MINLINE int len_manhattan_v2v2_int(const int a[2], const int b[2]) { int d[2]; |