Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergej Reich <sergej.reich@googlemail.com>2013-10-13 15:41:41 +0400
committerSergej Reich <sergej.reich@googlemail.com>2013-10-13 15:41:41 +0400
commit5d5176095e82b34499e15d74f1fb76d56f4d9508 (patch)
treedd8c61741160804873601f6b6350661132ac1b2f /source/blender/render/intern/source/pipeline.c
parentbcbf976b48762c2f25df470c6d13a124bc868a66 (diff)
parent42ac7164e30dcca565253aa265201aad497e5360 (diff)
svn merge -r60422:60726 ^/trunk/blender
Diffstat (limited to 'source/blender/render/intern/source/pipeline.c')
-rw-r--r--source/blender/render/intern/source/pipeline.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 6118d479cab..fa05f8dd18d 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1309,6 +1309,10 @@ static void do_render_blur_3d(Render *re)
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);