[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58526] branches/soc-2013-cycles_mblur/ intern/cycles/blender/blender_session.cpp: Changed the order of sync_data and sync_camera where necessary.

[Gavin Howard]

Revision: 58526
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58526
Author:   gdh
Date:     2013-07-23 04:59:20 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
Changed the order of sync_data and sync_camera where necessary.

As in my last commit, I wonder if it's okay to do this, but I noticed 
that at one point in blender_session.cpp that sync_camera *did* come 
before sync_data, so I believe it's alright.

Yell at me if it's not.

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp	2013-07-23 04:52:57 UTC (rev 58525)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp	2013-07-23 04:59:20 UTC (rev 58526)
@@ -168,8 +168,8 @@
 	sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress, session_params.device.type == DEVICE_CPU);
 
 	if(b_rv3d) {
+		sync->sync_camera(b_render, b_engine.camera_override(), width, height);
 		sync->sync_data(b_v3d, b_engine.camera_override());
-		sync->sync_camera(b_render, b_engine.camera_override(), width, height);
 	}
 
 	BufferParams buffer_params = BlenderSync::get_buffer_params(b_render, b_scene, PointerRNA_NULL, PointerRNA_NULL, scene->camera, width, height);
@@ -495,12 +495,12 @@
 	}
 
 	/* data and camera synchronize */
-	sync->sync_data(b_v3d, b_engine.camera_override());
-
 	if(b_rv3d)
 		sync->sync_view(b_v3d, b_rv3d, width, height);
 	else
 		sync->sync_camera(b_render, b_engine.camera_override(), width, height);
+	
+	sync->sync_data(b_v3d, b_engine.camera_override());
 
 	/* unlock */
 	session->scene->mutex.unlock();