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:
Diffstat (limited to 'intern/cycles/render/scene.cpp')
-rw-r--r--intern/cycles/render/scene.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 0b2e2b8a9b6..079f2744e73 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -152,13 +152,13 @@ void Scene::device_update(Device *device_, Progress& progress)
if(progress.get_cancel()) return;
- progress.set_status("Updating Integrator");
- integrator->device_update(device, &dscene);
+ progress.set_status("Updating Film");
+ film->device_update(device, &dscene);
if(progress.get_cancel()) return;
- progress.set_status("Updating Film");
- film->device_update(device, &dscene);
+ progress.set_status("Updating Integrator");
+ integrator->device_update(device, &dscene);
if(progress.get_cancel()) return;