[Bf-blender-cvs] [9431fc6] master: Cycles: Fix wrong initialization order of mesh flags and object transform

[Sergey Sharybin]

Commit: 9431fc67648be89de7a88d54d40b81038752001e
Author: Sergey Sharybin
Date:   Thu Mar 31 17:54:03 2016 +0200
Branches: master
https://developer.blender.org/rB9431fc67648be89de7a88d54d40b81038752001e

Cycles: Fix wrong initialization order of mesh flags and object transform

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

M	intern/cycles/render/scene.cpp

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

diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 62951af..9842cd1 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -167,13 +167,13 @@ void Scene::device_update(Device *device_, Progress& progress)
 
 	if(progress.get_cancel() || device->have_error()) return;
 
-	progress.set_status("Updating Objects");
-	object_manager->device_update(device, &dscene, this, progress);
+	progress.set_status("Updating Meshes Flags");
+	mesh_manager->device_update_flags(device, &dscene, this, progress);
 
 	if(progress.get_cancel() || device->have_error()) return;
 
-	progress.set_status("Updating Meshes Flags");
-	mesh_manager->device_update_flags(device, &dscene, this, progress);
+	progress.set_status("Updating Objects");
+	object_manager->device_update(device, &dscene, this, progress);
 
 	if(progress.get_cancel() || device->have_error()) return;