[Bf-blender-cvs] [9c5203c98fa] master: Fix T55626, fix T55106: Cycles motion blur + persistent images bug.

[Brecht Van Lommel]

Commit: 9c5203c98faac4ea66f5c17a9642b7142033aebe
Author: Brecht Van Lommel
Date:   Sun Jul 1 16:31:46 2018 +0200
Branches: master
https://developer.blender.org/rB9c5203c98faac4ea66f5c17a9642b7142033aebe

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

===================================================================

M	intern/cycles/blender/blender_camera.cpp
M	intern/cycles/blender/blender_object.cpp

===================================================================

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) {