diff options
| author | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
| commit | 7246c387435769a169ac24c91434c615df6434b4 (patch) | |
| tree | 61842e3e0ce85e80720fdd7476d44d2e629f59fd /source/blender/blenfont/intern/blf_util.c | |
| parent | c5f55d17096d373791363e46004176e3f7f7ae52 (diff) | |
| parent | 0b4bd3ddc016298e868169a541cf6c132b10c587 (diff) | |
Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view
Diffstat (limited to 'source/blender/blenfont/intern/blf_util.c')
| -rw-r--r-- | source/blender/blenfont/intern/blf_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenfont/intern/blf_util.c b/source/blender/blenfont/intern/blf_util.c index 09ddb56e53b..2243da4df18 100644 --- a/source/blender/blenfont/intern/blf_util.c +++ b/source/blender/blenfont/intern/blf_util.c @@ -15,7 +15,7 @@ #include "blf_internal.h" -unsigned int blf_next_p2(unsigned int x) +uint blf_next_p2(uint x) { x -= 1; x |= (x >> 16); @@ -27,9 +27,9 @@ unsigned int blf_next_p2(unsigned int x) return x; } -unsigned int blf_hash(unsigned int val) +uint blf_hash(uint val) { - unsigned int key; + uint key; key = val; key += ~(key << 16); |