[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60635] trunk/blender/source/blender/ render/intern/source/pipeline.c: Fix #36991, After rendering with Sampled Motion Blur, the moving objects place is wrong.

[Lukas Toenne]

Revision: 60635
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60635
Author:   lukastoenne
Date:     2013-10-09 16:49:13 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
Fix #36991, After rendering with Sampled Motion Blur, the moving objects place is wrong.
With mblur the render function was setting scene frame for each blur sample and calling DAG update, but not after the last sample is finished, leaving the scene in the wrong frame.

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	2013-10-09 16:04:08 UTC (rev 60634)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2013-10-09 16:49:13 UTC (rev 60635)
@@ -1309,6 +1309,10 @@
 	re->mblur_offs = 0.0f;
 	re->i.curblur = 0;   /* stats */
 	
+	/* make sure motion blur changes get reset to current frame */
+	if ((re->r.scemode & (R_NO_FRAME_UPDATE|R_BUTS_PREVIEW|R_VIEWPORT_PREVIEW))==0)
+		BKE_scene_update_for_newframe(re->main, re->scene, re->lay);
+	
 	/* weak... the display callback wants an active renderlayer pointer... */
 	re->result->renlay = render_get_active_layer(re, re->result);
 	re->display_draw(re->ddh, re->result, NULL);