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/mesh | |
| 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/mesh')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 6 |
1 files changed, 2 insertions, 4 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); |