From 342a18287f5e0d3cf3147669709dcce21b967946 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 19 Mar 2018 08:48:12 +0100 Subject: Cleanup: type conversion warning --- source/blender/blenlib/BLI_hash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenlib') 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; -- cgit v1.2.3