[Bf-blender-cvs] [e5f3193] master: Cycles: Fix wrong order in object flags calculations

Sergey Sharybin noreply at git.blender.org
Wed Apr 29 22:09:58 CEST 2015


Commit: e5f3193df30edbdcbc7111c1e3b9ccf7aa6ddfe2
Author: Sergey Sharybin
Date:   Thu Apr 30 01:07:38 2015 +0500
Branches: master
https://developer.blender.org/rBe5f3193df30edbdcbc7111c1e3b9ccf7aa6ddfe2

Cycles: Fix wrong order in object flags calculations

Object flags are depending on bounding box which is only available after
mesh synchronization.

This was broken since 7fd4c44 which happened quite close to the release
and oddly enough was not sopped by anyone. Render test is coming for this.

Was spotted by Thomas Dinges while working on another patch.

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

M	intern/cycles/render/scene.cpp

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

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




More information about the Bf-blender-cvs mailing list