[Bf-blender-cvs] [3e68ab7] soc-2014-shapekey: Cleaned up mm2_hash()

Grigory Revzin noreply at git.blender.org
Sun May 18 00:53:16 CEST 2014


Commit: 3e68ab7893513b4e0dd5912610d7469006538f91
Author: Grigory Revzin
Date:   Sun May 18 02:53:00 2014 +0400
https://developer.blender.org/rB3e68ab7893513b4e0dd5912610d7469006538f91

Cleaned up mm2_hash()

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

M	source/blender/blenkernel/intern/editmesh.c

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

diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c
index 6674bc2..7795730 100644
--- a/source/blender/blenkernel/intern/editmesh.c
+++ b/source/blender/blenkernel/intern/editmesh.c
@@ -254,9 +254,8 @@ void BKE_editmesh_color_ensure(BMEditMesh *em, const char htype)
 		const unsigned int m = 0x5bd1e995;
 		char r = 24;
 		unsigned int h = len + seed;
-		char * data = (char *) key;
-		for (; len >= 4; len -= 4, data += 4) {
-			unsigned int k = *(unsigned int *) data * m;
+		for (; len >= 4; len -= 4, key += 4) {
+			unsigned int k = *(unsigned int *) key * m;
 			k ^= k >> r;
 			k *= m;
 			h = (h * m) ^ k;
@@ -265,11 +264,11 @@ void BKE_editmesh_color_ensure(BMEditMesh *em, const char htype)
 		switch (len) {
 			/* everything fall-through */
 			case 3: 
-				h ^= data[2] << 16;
+				h ^= key[2] << 16;
 			case 2: 
-				h ^= data[1] << 8;
+				h ^= key[1] << 8;
 			case 1: 
-				h ^= data[0];
+				h ^= key[0];
 				h *= m;
 			default: /* do nothing */;
 		}




More information about the Bf-blender-cvs mailing list