archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

moved shape key insert function into BKE_object.h

Browse Source
This commit is contained in:
Campbell Barton
2009-12-28 15:26:36 +00:00
parent e09d77507e
commit 32656ad4ba
8 changed files with 303 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/mesh/meshtools.c
View File

@@ -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);