diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-31 15:36:51 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-31 15:43:19 +0400 |
| commit | e05d35bfaffec69ed4d990f6a90a1b9244970aa4 (patch) | |
| tree | 96d8099cd800bfc65a76fe8709e031b652d4960c /intern/cycles/blender/blender_object.cpp | |
| parent | a9b82244de30cd90cc27c000e0d84d9144c8c1ab (diff) | |
Fix T39510, Fix T39523: camera motion blur not working correct after recent changes.
Diffstat (limited to 'intern/cycles/blender/blender_object.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 69225594a03..f553fe23b8b 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -562,10 +562,6 @@ void BlenderSync::sync_motion(BL::SpaceView3D b_v3d, BL::Object b_override, void /* note iteration over motion_times set happens in sorted order */ foreach(float relative_time, motion_times) { - /* sync camera, only supports two times at the moment */ - if(relative_time == -1.0f || relative_time == 1.0f) - sync_camera_motion(b_cam, relative_time); - /* fixed shutter time to get previous and next frame for motion pass */ float shuttertime; @@ -584,6 +580,10 @@ void BlenderSync::sync_motion(BL::SpaceView3D b_v3d, BL::Object b_override, void b_scene.frame_set(frame, subframe); python_thread_state_save(python_thread_state); + /* sync camera, only supports two times at the moment */ + if(relative_time == -1.0f || relative_time == 1.0f) + sync_camera_motion(b_cam, relative_time); + /* sync object */ sync_objects(b_v3d, relative_time); } |