Cycles: fix AO pass not rendering with AO enabled for world, and make mask
[blender.git] / intern / cycles / render / scene.cpp
index 0b2e2b8a9b6afb3fc68b3238b19ba065066a5d73..079f2744e730d621218e6acba0eefb08c2ac9e5f 100644 (file)
@@ -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;