diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-12-28 18:26:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-12-28 18:26:36 +0300 |
| commit | 32656ad4ba6af89fcbd8247bc219e55be802ebdc (patch) | |
| tree | 031e69ef4c1184963a84a87dc76416942df0a5c5 /source/blender/editors/mesh | |
| parent | e09d77507e0d666d47b344a7043cc6f2154f1a5d (diff) | |
moved shape key insert function into BKE_object.h
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 02833bdf3f7..b004fcb0deb 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(scene, key); + kb= add_keyblock(key); mesh_to_key(me, kb); } @@ -604,7 +604,7 @@ int join_mesh_shapes_exec(bContext *C, wmOperator *op) if (!dm) continue; - kb= add_keyblock(scene, key); + kb= add_keyblock(key); strcpy(kb->name, base->object->id.name+2); BLI_uniquename(&key->block, kb, "Key", '.', offsetof(KeyBlock, name), 32); |