Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-02-02 20:06:31 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-02-02 20:09:01 +0300
commit30e4009f0a5e7738ea6851b76b5a85e5d5f19710 (patch)
tree558d588761544f2721498b1ca14550387e286e0a /intern/cycles/render/scene.cpp
parentddba5c27a754a7cd419d2f1d1b71871269b41f86 (diff)
Cycles: Solve dependency between camera and object synchronization
IN theory object might depend on camera location (spatial adaptive subdivisions for example) which became not possible to achieve after camera in volume support. Should be no functional changes for artists.
Diffstat (limited to 'intern/cycles/render/scene.cpp')
-rw-r--r--intern/cycles/render/scene.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index bb7c03cbe6d..64d6fa4b9b9 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -165,6 +165,11 @@ void Scene::device_update(Device *device_, Progress& progress)
if(progress.get_cancel() || device->have_error()) return;
+ progress.set_status("Updating Camera");
+ camera->device_update(device, &dscene, this);
+
+ if(progress.get_cancel() || device->have_error()) return;
+
progress.set_status("Updating Objects");
object_manager->device_update(device, &dscene, this, progress);
@@ -185,6 +190,11 @@ void Scene::device_update(Device *device_, Progress& progress)
if(progress.get_cancel() || device->have_error()) return;
+ progress.set_status("Updating Camera Volume");
+ camera->device_update_volume(device, &dscene, this);
+
+ if(progress.get_cancel() || device->have_error()) return;
+
progress.set_status("Updating Hair Systems");
curve_system_manager->device_update(device, &dscene, this, progress);
@@ -195,12 +205,6 @@ void Scene::device_update(Device *device_, Progress& progress)
if(progress.get_cancel() || device->have_error()) return;
- /* TODO(sergey): Make sure camera is not needed above. */
- progress.set_status("Updating Camera");
- camera->device_update(device, &dscene, this);
-
- if(progress.get_cancel() || device->have_error()) return;
-
progress.set_status("Updating Lights");
light_manager->device_update(device, &dscene, this, progress);