Fix T55626, fix T55106: Cycles motion blur + persistent images bug.

2018-07-01 16:31:46 +02:00
parent ddee0931b8
commit 9c5203c98f
2 changed files with 2 additions and 0 deletions
--- 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;
--- 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) {