diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-01 21:15:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-01 21:15:21 +0300 |
| commit | 37994e0af2cf6f0d7ed8a072eb765dfb022ceaef (patch) | |
| tree | 07ea3a893aa2dc586f22a46681aa77c430f63317 /intern | |
| parent | 192e5d65a746798f6bddf897570ff8aba55c9c5a (diff) | |
| parent | 26c5a1c301d3d554c4b1244b219f9883249f382d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -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 aea63b6b31f..c5df5842bad 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 e0737d5118a..6d6b367209d 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -448,6 +448,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph& b_depsgraph, mesh->motion_steps = motion_steps; } + object->motion.clear(); object->motion.resize(motion_steps, transform_empty()); if(motion_steps) { |