[Bf-blender-cvs] [c6c9a27] soc-2014-shapekey: Revert "Minor cleanup in key.c"

[Grigory Revzin]

Commit: c6c9a279ab0f9760403507e3f4e7ef07fdb0a364
Author: Grigory Revzin
Date:   Sat May 10 18:29:48 2014 +0400
https://developer.blender.org/rBc6c9a279ab0f9760403507e3f4e7ef07fdb0a364

Revert "Minor cleanup in key.c"

This reverts commit 25883c59cd0320c5f0841145352aed411220def5.

Was a terrible idea after two hours of WTF crashes

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

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

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

diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 3aaa7c4..d86a669 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -73,26 +73,10 @@
 #define IPO_BEZTRIPLE   100
 #define IPO_BPOINT      101
 
-#define ELEMSIZE_MESH		(sizeof(float) * 3)
-#define ELEMSIZE_LATTICE	(sizeof(float) * 3)
-#define ELEMSIZE_CURVE		(sizeof(float) * 4)
-
-int get_elemsize(Object *ob)
-{
-	switch (ob->type) {
-	case OB_MESH:
-		return ELEMSIZE_MESH;
-	case OB_LATTICE:
-		return ELEMSIZE_LATTICE;
-	case OB_CURVE:
-		return ELEMSIZE_CURVE;
-	}
-	return 0;
-}
-
 /* extern, not threadsafe */
 int slurph_opt = 1;
 
+
 void BKE_key_free(Key *key)
 {
 	KeyBlock *kb;
@@ -138,6 +122,8 @@ Key *BKE_key_add(ID *id)    /* common function */
 			el[1] = IPO_FLOAT;
 			el[2] = 0;
 
+			key->elemsize = 3 * sizeof(float);
+
 			break;
 		case ID_LT:
 			el = key->elemstr;
@@ -146,6 +132,8 @@ Key *BKE_key_add(ID *id)    /* common function */
 			el[1] = IPO_FLOAT;
 			el[2] = 0;
 
+			key->elemsize = 3 * sizeof(float);
+
 			break;
 		case ID_CU:
 			el = key->elemstr;
@@ -154,11 +142,11 @@ Key *BKE_key_add(ID *id)    /* common function */
 			el[1] = IPO_BPOINT;
 			el[2] = 0;
 
+			key->elemsize = 4 * sizeof(float);
+
 			break;
 	}
-
-	key->elemsize = get_elemsize(id->);
-
+	
 	return key;
 }