[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25946] trunk/blender/source/blender/ render/intern/source/pipeline.c: Fix [#20557] animated node values haven' t effect while render animati?\195?\179n

[Matt Ebb]

Revision: 25946
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25946
Author:   broken
Date:     2010-01-13 04:21:55 +0100 (Wed, 13 Jan 2010)

Log Message:
-----------
Fix [#20557] animated node values haven't effect while render animati?\195?\179n

Was only updating the animation system for the render process - if scene render was skipped
(as is the case for comp trees without renderlayer nodes) then the animation system wouldn't
update.

Added in an update here, Aligorith, maybe you'd like to doublecheck.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2010-01-13 02:59:42 UTC (rev 25945)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2010-01-13 03:21:55 UTC (rev 25946)
@@ -2366,6 +2366,7 @@
 static void do_render_composite_fields_blur_3d(Render *re)
 {
 	bNodeTree *ntree= re->scene->nodetree;
+	int update_newframe=0;
 	
 	/* INIT seeding, compositor can use random texture */
 	BLI_srandom(re->r.cfra);
@@ -2375,6 +2376,9 @@
 		ntreeFreeCache(ntree);
 		
 		do_render_fields_blur_3d(re);
+	} else {
+		/* scene render process already updates animsys */
+		update_newframe = 1;
 	}
 	
 	/* swap render result */
@@ -2403,10 +2407,14 @@
 					R.sdh= re->sdh;
 					R.stats_draw= re->stats_draw;
 					
+					if (update_newframe)
+						scene_update_for_newframe(re->scene, re->scene->lay);
+					
 					if(re->r.scemode & R_FULL_SAMPLE) 
 						do_merge_fullsample(re, ntree);
-					else
+					else {
 						ntreeCompositExecTree(ntree, &re->r, G.background==0);
+					}
 					
 					ntree->stats_draw= NULL;
 					ntree->test_break= NULL;