[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56851] trunk/blender/source/blender/ render/intern/source/external_engine.c: Fix #35384: animation to enable/ disable render layers was applied one frame too

Brecht Van Lommel brechtvanlommel at pandora.be
Thu May 16 14:03:21 CEST 2013


Revision: 56851
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56851
Author:   blendix
Date:     2013-05-16 12:03:21 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Fix #35384: animation to enable/disable render layers was applied one frame too
late when rendering animations.

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

Modified: trunk/blender/source/blender/render/intern/source/external_engine.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/external_engine.c	2013-05-16 11:24:19 UTC (rev 56850)
+++ trunk/blender/source/blender/render/intern/source/external_engine.c	2013-05-16 12:03:21 UTC (rev 56851)
@@ -408,6 +408,11 @@
 	if (!do_all && (type->flag & RE_USE_POSTPROCESS))
 		return 0;
 
+	/* update animation here so any render layer animation is applied before
+	 * creating the render result */
+	if ((re->r.scemode & (R_NO_FRAME_UPDATE | R_BUTS_PREVIEW)) == 0)
+		BKE_scene_update_for_newframe(re->main, re->scene, re->lay);
+
 	/* create render result */
 	BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
 	if (re->result == NULL || !(re->r.scemode & R_BUTS_PREVIEW)) {
@@ -451,9 +456,6 @@
 	engine->resolution_x = re->winx;
 	engine->resolution_y = re->winy;
 
-	if ((re->r.scemode & (R_NO_FRAME_UPDATE | R_BUTS_PREVIEW)) == 0)
-		BKE_scene_update_for_newframe(re->main, re->scene, re->lay);
-
 	RE_parts_init(re, FALSE);
 	engine->tile_x = re->partx;
 	engine->tile_y = re->party;




More information about the Bf-blender-cvs mailing list