diff options
| author | Jacques Lucke <mail@jlucke.com> | 2020-02-10 14:01:07 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2020-02-10 14:01:07 +0300 |
| commit | 605928c15b0748068137c620e1894112b838baf2 (patch) | |
| tree | cbd28ef62574175de2d551336cc16d0bf2748eb4 /source/blender/blenlib/intern/math_base_inline.c | |
| parent | 9880bebd1a9a6262b16635bfeb7b003ea3ec0a9b (diff) | |
| parent | 795c4a3462536d1e780b227d6877a8693f656cf9 (diff) | |
Merge branch 'master' into functions
Diffstat (limited to 'source/blender/blenlib/intern/math_base_inline.c')
| -rw-r--r-- | source/blender/blenlib/intern/math_base_inline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c index f62edda683d..46c0550e42f 100644 --- a/source/blender/blenlib/intern/math_base_inline.c +++ b/source/blender/blenlib/intern/math_base_inline.c @@ -224,7 +224,7 @@ MINLINE unsigned int power_of_2_max_u(unsigned int x) return x + 1; } -MINLINE unsigned power_of_2_min_u(unsigned x) +MINLINE unsigned int power_of_2_min_u(unsigned int x) { x |= (x >> 1); x |= (x >> 2); |