- object.add_shape_key(name="Key", from_mix=True)

- ensure new shape key names are unique
- Transfer ShapeKey now can have its settings changes (redo operator)

3 files changed, 6 insertions, 8 deletions

diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index b004fcb0deb..949faf16ef9 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -588,7 +588,7 @@ int join_mesh_shapes_exec(bContext *C, wmOperator *op)
 		key->type= KEY_RELATIVE;
 
 		/* first key added, so it was the basis. initialise it with the existing mesh */
-		kb= add_keyblock(key);
+		kb= add_keyblock(key, NULL);
 		mesh_to_key(me, kb);
 	}
 	
@@ -604,9 +604,7 @@ int join_mesh_shapes_exec(bContext *C, wmOperator *op)
 				
 				if (!dm) continue;
 					
-				kb= add_keyblock(key);
-				strcpy(kb->name, base->object->id.name+2);
-				BLI_uniquename(&key->block, kb, "Key", '.', offsetof(KeyBlock, name), 32);
+				kb= add_keyblock(key, base->object->id.name+2);
 				
 				DM_to_meshkey(dm, me, kb);
 				
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 8bfc9a66690..3e9b1cfe7c7 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -370,11 +370,11 @@ static int modifier_apply_shape(ReportList *reports, Scene *scene, Object *ob, M
 			key->type= KEY_RELATIVE;
 			/* if that was the first key block added, then it was the basis.
 			 * Initialise it with the mesh, and add another for the modifier */
-			kb= add_keyblock(key);
+			kb= add_keyblock(key, NULL);
 			mesh_to_key(me, kb);
 		}
 
-		kb= add_keyblock(key);
+		kb= add_keyblock(key, md->name);
 		DM_to_meshkey(dm, me, kb);
 		
 		dm->release(dm);
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c
index 5d839e60ca9..99b35b998c2 100644
--- a/source/blender/editors/object/object_shapekey.c
+++ b/source/blender/editors/object/object_shapekey.c
@@ -84,7 +84,7 @@
 
 static void ED_object_shape_key_add(bContext *C, Scene *scene, Object *ob, int from_mix)
 {
-	if(object_insert_shape_key(scene, ob, from_mix)) {
+	if(object_insert_shape_key(scene, ob, NULL, from_mix)) {
 		Key *key= ob_get_key(ob);
 		ob->shapenr= BLI_countlist(&key->block);
 
@@ -241,7 +241,7 @@ static int shape_key_add_exec(bContext *C, wmOperator *op)
 	int from_mix = RNA_boolean_get(op->ptr, "from_mix");
 
 	ED_object_shape_key_add(C, scene, ob, from_mix);
-	
+
 	return OPERATOR_FINISHED;
 }