Commit: 3108861981dbeedc679b2b9015f18d46f6d718e3
Author: Sergey Sharybin
Date: Thu Mar 31 17:54:03 2016 +0200
Branches: blender-v2.77-release
https://developer.blender.org/rB3108861981dbeedc679b2b9015f18d46f6d718e3
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
