diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-13 11:39:21 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-13 11:39:21 +0300 |
| commit | 9604db76505fb832252776810edc430c9159542a (patch) | |
| tree | 58637b7da1413faeb6522598d45864e84011ca5f /intern/cycles/render/scene.cpp | |
| parent | c8e2cc21aba05278c92a8cb023b379424ca0d43e (diff) | |
Fix T47813: Cycles Standalone not respecting integrator sample_clamp_direct
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 9842cd10a1e..ece4919dedb 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -217,13 +217,13 @@ void Scene::device_update(Device *device_, Progress& progress) if(progress.get_cancel() || device->have_error()) return; - progress.set_status("Updating Film"); - film->device_update(device, &dscene, this); + progress.set_status("Updating Integrator"); + integrator->device_update(device, &dscene, this); if(progress.get_cancel() || device->have_error()) return; - progress.set_status("Updating Integrator"); - integrator->device_update(device, &dscene, this); + progress.set_status("Updating Film"); + film->device_update(device, &dscene, this); if(progress.get_cancel() || device->have_error()) return; |