kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix [#27485] Create new shapekey on lattice

Browse Source
This commit is contained in:
Campbell Barton 2011-05-26 06:34:31 +00:00
parent dec09f2a3b
commit 9af390ab67
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenkernel/intern/object.c
View File

@ -3037,10 +3037,15 @@ static KeyBlock *insert_lattkey(Scene *scene, Object *ob, const char *name, int
if(newkey || from_mix==FALSE) {
kb= add_keyblock(key, name);
/* create from lattice */
if (!newkey) {
KeyBlock *basekb= (KeyBlock *)key->block.first;
kb->data= MEM_dupallocN(basekb->data);
kb->totelem= basekb->totelem;
}
else {
latt_to_key(lt, kb);
}
}
else {
/* copy from current values */
float *data= do_ob_key(scene, ob);
@ -3075,7 +3080,10 @@ static KeyBlock *insert_curvekey(Scene *scene, Object *ob, const char *name, int
KeyBlock *basekb= (KeyBlock *)key->block.first;
kb->data= MEM_dupallocN(basekb->data);
kb->totelem= basekb->totelem;
} else curve_to_key(cu, kb, lb);
}
else {
curve_to_key(cu, kb, lb);
}
}
else {
/* copy from current values */