diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-12 15:05:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-12 15:05:16 +0400 |
| commit | 4c9486f13d40cb066ad4643537d926559c6ea481 (patch) | |
| tree | 62ef92d3d84b3675a7f2167fb589de5fb3cdcde6 /source/blender/blenkernel/intern/object.c | |
| parent | 4b8ab31d81e335a1d5e45dc950ea1350dc1ca1c4 (diff) | |
change add_keyblock() not to sort keyblocks by time since this can be a problem when using the function in lower level parts of the code, instead add add_keyblock_ctime() which sets time and sorts on absolute shape keys.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 237d268e307..4d8d6e937a9 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2869,7 +2869,7 @@ static KeyBlock *insert_meshkey(Scene *scene, Object *ob, const char *name, int if (newkey || from_mix==FALSE) { /* create from mesh */ - kb= add_keyblock(key, name); + kb = add_keyblock_ctime(key, name, FALSE); mesh_to_key(me, kb); } else { @@ -2877,7 +2877,7 @@ static KeyBlock *insert_meshkey(Scene *scene, Object *ob, const char *name, int float *data= do_ob_key(scene, ob); /* create new block with prepared data */ - kb= add_keyblock(key, name); + kb = add_keyblock_ctime(key, name, FALSE); kb->data= data; kb->totelem= me->totvert; } @@ -2899,7 +2899,7 @@ static KeyBlock *insert_lattkey(Scene *scene, Object *ob, const char *name, int } if (newkey || from_mix==FALSE) { - kb= add_keyblock(key, name); + kb = add_keyblock_ctime(key, name, FALSE); if (!newkey) { KeyBlock *basekb= (KeyBlock *)key->block.first; kb->data= MEM_dupallocN(basekb->data); @@ -2914,7 +2914,7 @@ static KeyBlock *insert_lattkey(Scene *scene, Object *ob, const char *name, int float *data= do_ob_key(scene, ob); /* create new block with prepared data */ - kb= add_keyblock(key, name); + kb = add_keyblock_ctime(key, name, FALSE); kb->totelem= lt->pntsu*lt->pntsv*lt->pntsw; kb->data= data; } @@ -2938,7 +2938,7 @@ static KeyBlock *insert_curvekey(Scene *scene, Object *ob, const char *name, int if (newkey || from_mix==FALSE) { /* create from curve */ - kb= add_keyblock(key, name); + kb = add_keyblock_ctime(key, name, FALSE); if (!newkey) { KeyBlock *basekb= (KeyBlock *)key->block.first; kb->data= MEM_dupallocN(basekb->data); @@ -2953,7 +2953,7 @@ static KeyBlock *insert_curvekey(Scene *scene, Object *ob, const char *name, int float *data= do_ob_key(scene, ob); /* create new block with prepared data */ - kb= add_keyblock(key, name); + kb = add_keyblock_ctime(key, name, FALSE); kb->totelem= count_curveverts(lb); kb->data= data; } |