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:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2016-07-16 19:56:59 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-07-18 23:40:08 +0300
commit10b0e33de1b9b57693ebcec7d503d3b204043f56 (patch)
tree7851232b17d632a72ee9516b4808f87f3432ad3d /intern/cycles/blender/blender_object.cpp
parent20ec6bc166e31449cce48a5a658f26caf96f71fa (diff)
Cycles: add support for motion blurring of fluid meshes.
Reviewed By: brecht Differential Revision: https://developer.blender.org/D2063
Diffstat (limited to 'intern/cycles/blender/blender_object.cpp')
-rw-r--r--intern/cycles/blender/blender_object.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index ede8c47efa7..22a0b3988c8 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -719,12 +719,7 @@ void BlenderSync::sync_motion(BL::RenderSettings& b_render,
<< relative_time << ".";
/* fixed shutter time to get previous and next frame for motion pass */
- float shuttertime;
-
- if(scene->need_motion() == Scene::MOTION_PASS)
- shuttertime = 2.0f;
- else
- shuttertime = scene->camera->shuttertime;
+ float shuttertime = scene->motion_shutter_time();
/* compute frame and subframe time */
float time = frame_center + frame_center_delta + relative_time * shuttertime * 0.5f;