[Bf-blender-cvs] [342a18287f5] master: Cleanup: type conversion warning

Campbell Barton noreply at git.blender.org
Mon Mar 19 09:14:46 CET 2018


Commit: 342a18287f5e0d3cf3147669709dcce21b967946
Author: Campbell Barton
Date:   Mon Mar 19 08:48:12 2018 +0100
Branches: master
https://developer.blender.org/rB342a18287f5e0d3cf3147669709dcce21b967946

Cleanup: type conversion warning

===================================================================

M	source/blender/blenlib/BLI_hash.h

===================================================================

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;



More information about the Bf-blender-cvs mailing list