[Bf-blender-cvs] [d3bb322] depsgraph_refactor: Depsgraph: Knock out BKE_animsys_evaluate_all_animation() for new depsgraph

Joshua Leung noreply at git.blender.org
Fri Jan 16 08:04:39 CET 2015


Commit: d3bb3227f05d82b81e60b353255d5b7a41ea7d71
Author: Joshua Leung
Date:   Fri Jan 16 20:03:42 2015 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rBd3bb3227f05d82b81e60b353255d5b7a41ea7d71

Depsgraph: Knock out BKE_animsys_evaluate_all_animation() for new depsgraph

To debug what animdata is not yet included, we need to disable this. Eventually,
it should go, but we may need to put it back temporarily if we don't get
everything hooked up before setting more users loose on the codebase.

===================================================================

M	source/blender/blenkernel/intern/scene.c

===================================================================

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 98a4cdd..e6b0a1d 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1848,8 +1848,12 @@ void BKE_scene_update_for_newframe_ex(EvaluationContext *eval_ctx, Main *bmain,
 	 * can be overridden by settings from Scene, which owns the Texture through a hierarchy
 	 * such as Scene->World->MTex/Texture) can still get correctly overridden.
 	 */
-	BKE_animsys_evaluate_all_animation(bmain, sce, ctime);
-	/*...done with recursive funcs */
+#ifdef WITH_LEGACY_DEPSGRAPH
+	if (!use_new_eval) {
+		BKE_animsys_evaluate_all_animation(bmain, sce, ctime);
+		/*...done with recursive funcs */
+	}
+#endif
 
 	/* clear "LIB_DOIT" flag from all materials, to prevent infinite recursion problems later 
 	 * when trying to find materials with drivers that need evaluating [#32017]




More information about the Bf-blender-cvs mailing list