diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-31 18:54:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-31 18:54:03 +0300 |
| commit | 9431fc67648be89de7a88d54d40b81038752001e (patch) | |
| tree | 23fd9cfc934aaedfff897635f4130fdceb93b6c7 /intern/cycles/render/scene.cpp | |
| parent | 185d00258666eba96a8c838964c9e17bd898d8a1 (diff) | |
Cycles: Fix wrong initialization order of mesh flags and object transform
Diffstat (limited to 'intern/cycles/render/scene.cpp')
| -rw-r--r-- | intern/cycles/render/scene.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 62951af7f6b..9842cd10a1e 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; |