[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45385] trunk/blender/source/blender/bmesh /intern/bmesh_mesh_conv.c: fix [#30797] Shape keys on linked duplicate get corrupted

[Campbell Barton]

Revision: 45385
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45385
Author:   campbellbarton
Date:     2012-04-04 00:45:40 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
fix [#30797] Shape keys on linked duplicate get corrupted

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c	2012-04-04 00:27:13 UTC (rev 45384)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c	2012-04-04 00:45:40 UTC (rev 45385)
@@ -99,7 +99,7 @@
 		actkey = NULL;
 	}
 
-	if (actkey && actkey->totelem == me->totvert) {
+	if (me->key) {
 		CustomData_add_layer(&bm->vdata, CD_SHAPE_KEYINDEX, CD_ASSIGN, NULL, 0);
 
 		/* check if we need to generate unique ids for the shapekeys.
@@ -117,8 +117,11 @@
 			}
 		}
 
-		keyco = actkey->data;
-		bm->shapenr = act_key_nr;
+		if (actkey && actkey->totelem == me->totvert) {
+			keyco = actkey->data;
+			bm->shapenr = act_key_nr;
+		}
+
 		for (i = 0, block = me->key->block.first; block; block = block->next, i++) {
 			CustomData_add_layer_named(&bm->vdata, CD_SHAPEKEY,
 			                           CD_ASSIGN, NULL, 0, block->name);