Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2009-12-28 21:03:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2009-12-28 21:03:04 +0300
commit8177f343a0303a66e36f2b78566045c0dea0b406 (patch)
treeb1b63d0aac8df1cfb349895fceeff1047cecc43e /source/blender/editors/object/object_shapekey.c
parent32656ad4ba6af89fcbd8247bc219e55be802ebdc (diff)
- 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)
Diffstat (limited to 'source/blender/editors/object/object_shapekey.c')
-rw-r--r--source/blender/editors/object/object_shapekey.c4
1 files changed, 2 insertions, 2 deletions
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;
}