[Bf-blender-cvs] [9ae9c26] master: Folowup for old fix for material animation

Sergey Sharybin noreply at git.blender.org
Tue May 13 16:15:29 CEST 2014


Commit: 9ae9c268cac7aeadb53052bd493b4b4782ea1c64
Author: Sergey Sharybin
Date:   Tue May 13 15:19:49 2014 +0200
https://developer.blender.org/rB9ae9c268cac7aeadb53052bd493b4b4782ea1c64

Folowup for old fix for material animation

Need to update node trees, so cycles materials are also updating
when tweaking settings from dopesheet/graph editor.

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

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

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 0e95cf1..c94d0df 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1599,7 +1599,20 @@ void BKE_scene_update_tagged(EvaluationContext *eval_ctx, Main *bmain, Scene *sc
 				BKE_animsys_evaluate_animdata(scene, &material->id, adt, ctime, 0);
 		}
 	}
-	
+
+	/* Also do the same for node trees. */
+	if (DAG_id_type_tagged(bmain, ID_NT)) {
+		float ctime = BKE_scene_frame_get(scene);
+
+		FOREACH_NODETREE(bmain, ntree, id)
+		{
+			AnimData *adt = BKE_animdata_from_id(&ntree->id);
+			if (adt && (adt->recalc & ADT_RECALC_ANIM))
+				BKE_animsys_evaluate_animdata(scene, &ntree->id, adt, ctime, 0);
+		}
+		FOREACH_NODETREE_END
+	}
+
 	/* notify editors and python about recalc */
 	BLI_callback_exec(bmain, &scene->id, BLI_CB_EVT_SCENE_UPDATE_POST);
 	DAG_ids_check_recalc(bmain, scene, false);




More information about the Bf-blender-cvs mailing list