diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-12-28 21:03:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-12-28 21:03:04 +0300 |
| commit | 8177f343a0303a66e36f2b78566045c0dea0b406 (patch) | |
| tree | b1b63d0aac8df1cfb349895fceeff1047cecc43e /source/blender/editors/object/object_modifier.c | |
| parent | 32656ad4ba6af89fcbd8247bc219e55be802ebdc (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_modifier.c')
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |