diff options
author | Ton Roosendaal <ton@blender.org> | 2013-05-17 17:15:43 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2013-05-17 17:15:43 +0400 |
commit | e2f58d817a9012b4642b96ef9cff26ed906dd62d (patch) | |
tree | 98bebe074d4585c0483ad90f0a946c4d552083e4 /source/blender/blenkernel/intern/key.c | |
parent | 27baa34ba4d5b94f640937f2bf00a9155843d368 (diff) |
Bug fix, own collection.
Shapekey drivers were executed for every call to derivedmesh, which shouldn't happen.
It now only runs on the object_update() function, once for every depsgraph change.
Error was found while testing preview render in viewport. On each render, the
animsys sent a 'changed data' because of the shapekey drivers being called,
causing eternal re-render loops (without showing anything).
Diffstat (limited to 'source/blender/blenkernel/intern/key.c')
-rw-r--r-- | source/blender/blenkernel/intern/key.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 5c25469facc..74bf36adc6e 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -1389,10 +1389,6 @@ float *BKE_key_evaluate_object(Scene *scene, Object *ob, int *r_totelem) cp_cu_key(ob->data, key, actkb, kb, 0, tot, out, tot); } else { - /* do shapekey local drivers */ - float ctime = BKE_scene_frame_get(scene); - - BKE_animsys_evaluate_animdata(scene, &key->id, key->adt, ctime, ADT_RECALC_DRIVERS); if (ob->type == OB_MESH) do_mesh_key(scene, ob, key, out, tot); else if (ob->type == OB_LATTICE) do_latt_key(scene, ob, key, out, tot); |