[Bf-blender-cvs] [e05d35b] master: Fix T39510, Fix T39523: camera motion blur not working correct after recent changes.

[Brecht Van Lommel]

Commit: e05d35bfaffec69ed4d990f6a90a1b9244970aa4
Author: Brecht Van Lommel
Date:   Mon Mar 31 13:36:51 2014 +0200
https://developer.blender.org/rBe05d35bfaffec69ed4d990f6a90a1b9244970aa4

Fix T39510, Fix T39523: camera motion blur not working correct after recent changes.

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

M	intern/cycles/blender/blender_object.cpp

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

diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 6922559..f553fe2 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);
 	}