diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-03 14:11:19 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-03 14:13:41 +0400 |
| commit | 0fa7e4c853e07cfc6bd898c85cd0aa3119f97aa8 (patch) | |
| tree | 2ca881a72e849dd751a133411a32e7787cb3876a /intern/cycles/render/scene.cpp | |
| parent | 9ce645e7d9697162f577f433844da7771cbea9a6 (diff) | |
Cycles: Decouple object flags update to a separate update step
This way there's much less cross-references between objects and meshes
device update functions.
The only thing remained s the object bounds calculation which is needed
by bvh update. This could also be decoupled, but it's not that crucial
yet because its's how it used to be for ages now.
Diffstat (limited to 'intern/cycles/render/scene.cpp')
| -rw-r--r-- | intern/cycles/render/scene.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index d0de8c51300..6c3f98bc9b0 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -175,6 +175,11 @@ void Scene::device_update(Device *device_, Progress& progress) if(progress.get_cancel()) return; + progress.set_status("Updating Objects Flags"); + object_manager->device_update_flags(device, &dscene, this, progress); + + if(progress.get_cancel()) return; + progress.set_status("Updating Hair Systems"); curve_system_manager->device_update(device, &dscene, this, progress); |