[Bf-blender-cvs] [7768dcb] depsgraph_refactor: Depsgraph: Noted 2 places where driver evaluation should not be taking place
Joshua Leung
noreply at git.blender.org
Fri Jan 16 08:04:41 CET 2015
Commit: 7768dcbc73683b15196a44ac5311a6d7cb82d6ff
Author: Joshua Leung
Date: Fri Jan 16 20:04:28 2015 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rB7768dcbc73683b15196a44ac5311a6d7cb82d6ff
Depsgraph: Noted 2 places where driver evaluation should not be taking place
We can't remove these outright yet, since these callbacks are still shared between
old depsgraph and new ubereval nodes.
===================================================================
M source/blender/blenkernel/intern/object_update.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index b7d784b..f3e6b99 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -159,12 +159,14 @@ void BKE_object_handle_data_update(EvaluationContext *eval_ctx,
if (G.debug & G_DEBUG_DEPSGRAPH)
printf("recalcdata %s\n", ob->id.name + 2);
+ // XXX: legacy depsgraph only!!!
if (adt) {
/* evaluate drivers - datalevel */
/* XXX: for mesh types, should we push this to derivedmesh instead? */
BKE_animsys_evaluate_animdata(scene, data_id, adt, ctime, ADT_RECALC_DRIVERS);
}
-
+
+ // XXX: legacy depsgraph only!!!
key = BKE_key_from_object(ob);
if (key && key->block.first) {
if (!(ob->shapeflag & OB_SHAPE_LOCK))
More information about the Bf-blender-cvs
mailing list