diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-08-02 10:10:24 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-08-02 10:10:24 +0400 |
commit | 24d1cf7d5493c2fe8fbf72e0fb5d8ec77346d4aa (patch) | |
tree | 268c0967d2f02f0d618d757f56afa029f6aa8bcc /source/blender/blenkernel/intern/key.c | |
parent | de36dd1e99476f311055a4ac62aacc3cdbda193b (diff) |
Animato - Bugfixes for ShapeKeys + ShapeKey Drivers
* Animated ShapeKey F-Curves/Drivers are now visible in the Animation Editors.
* As a result of this, the old 'ShapeKeys' mode (which would display all the shapekey channels, even if they had no keyframes yet) in the DopeSheet, no longer works for now. However, it would have been of no use as no sliders were shown anyway.
* Drivers which depended on the rotation of bones now work again. These now point to the right RNA properties, and get some extra 'time' corrections (for degrees -> radians change).
Diffstat (limited to 'source/blender/blenkernel/intern/key.c')
-rw-r--r-- | source/blender/blenkernel/intern/key.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 595ba37e09c..a2fa97cabc9 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -1382,18 +1382,11 @@ int do_ob_key(Scene *scene, Object *ob) return 1; } else { -#if 0 // XXX old animation system - // NOTE: this stuff was NEVER reliable at all... - if(ob->ipoflag & OB_ACTION_KEY) - do_all_object_actions(scene, ob); - else { - calc_ipo(key->ipo, bsystem_time(scene, ob, scene->r.cfra, 0.0)); - execute_ipo((ID *)key, key->ipo); - } -#endif // XXX old animation system /* do shapekey local drivers */ float ctime= (float)scene->r.cfra; // XXX this needs to be checked - if (G.f & G_DEBUG) printf("ob %s - do shapekey (%s) drivers \n", ob->id.name+2, key->id.name+2); + + if (G.f & G_DEBUG) + printf("ob %s - do shapekey (%s) drivers \n", ob->id.name+2, key->id.name+2); BKE_animsys_evaluate_animdata(&key->id, key->adt, ctime, ADT_RECALC_DRIVERS); if(ob->type==OB_MESH) return do_mesh_key(scene, ob, ob->data); |