diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-01 17:31:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-01 17:32:35 +0300 |
| commit | 9c5203c98faac4ea66f5c17a9642b7142033aebe (patch) | |
| tree | fe989c91e99bbf994b4cfe083eaed4ce0ff1f2ab | |
| parent | ddee0931b8687d01186f1941d483c6b3622d1833 (diff) | |
Fix T55626, fix T55106: Cycles motion blur + persistent images bug.
| -rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 1 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index 435afabc2bb..1b798bcb42c 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -457,6 +457,7 @@ static void blender_camera_sync(Camera *cam, cam->matrix = blender_camera_matrix(bcam->matrix, bcam->type, bcam->panorama_type); + cam->motion.clear(); cam->motion.resize(bcam->motion_steps, cam->matrix); cam->use_perspective_motion = false; cam->shuttertime = bcam->shuttertime; diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 86b04f5030c..7f9018964c7 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -414,6 +414,7 @@ Object *BlenderSync::sync_object(BL::Object& b_parent, mesh->motion_steps = motion_steps; } + object->motion.clear(); object->motion.resize(motion_steps, transform_empty()); if(motion_steps) { |