diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-21 20:04:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-21 20:04:02 +0300 |
| commit | d6b5ee99fed2d579f0b561e98cf5eaca4304fea6 (patch) | |
| tree | 98eeee99566a3727a7db3effccd855a835d18952 /intern/cycles/blender/blender_object.cpp | |
| parent | 1de1cedf4c2fe3dc460267ea3134f17df508b7d9 (diff) | |
| parent | f1304c973f5eef5169e09d30c0dba82cc7e4c4a1 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/blender/blender_object.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 37fea2417ba..e55023c5400 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -461,7 +461,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph& b_depsgraph, uint motion_steps; - if(scene->need_motion() == Scene::MOTION_BLUR) { + if(need_motion == Scene::MOTION_BLUR) { motion_steps = object_motion_steps(b_parent, b_ob); mesh->motion_steps = motion_steps; if(motion_steps && object_use_deform_motion(b_parent, b_ob)) { |