diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-19 10:48:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-19 11:12:48 +0300 |
| commit | 342a18287f5e0d3cf3147669709dcce21b967946 (patch) | |
| tree | 7a8f18aed8f3f47b60340d202de1d4a83d71e09c /source/blender | |
| parent | 7729966af102e04763d53f58f64513fd2080ada3 (diff) | |
Cleanup: type conversion warning
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenlib/BLI_hash.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/BLI_hash.h b/source/blender/blenlib/BLI_hash.h index 9ca7898d6b8..f74010479a9 100644 --- a/source/blender/blenlib/BLI_hash.h +++ b/source/blender/blenlib/BLI_hash.h @@ -72,7 +72,7 @@ BLI_INLINE void BLI_hash_pointer_to_color(const void *ptr, int *r, int *g, int * { size_t val = (size_t)ptr; const size_t hash_a = BLI_hash_int(val & 0x0000ffff); - const size_t hash_b = BLI_hash_int((val & 0xffff0000) >> 32); + const size_t hash_b = BLI_hash_int((uint)((val & 0xffff0000) >> 32)); const size_t hash = hash_a ^ (hash_b + 0x9e3779b9 + (hash_a << 6) + (hash_a >> 2)); *r = (hash & 0xff0000) >> 16; |