diff options
Diffstat (limited to 'intern/cycles/render/scene.cpp')
-rw-r--r-- | intern/cycles/render/scene.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 2b0609fdf1f..a6dca62ffd0 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -99,7 +99,7 @@ void Scene::free_memory(bool final) object_manager->device_free(device, &dscene); mesh_manager->device_free(device, &dscene); - shader_manager->device_free(device, &dscene); + shader_manager->device_free(device, &dscene, this); light_manager->device_free(device, &dscene); particle_system_manager->device_free(device, &dscene); @@ -187,7 +187,6 @@ void Scene::device_update(Device *device_, Progress& progress) progress.set_status("Updating Particle Systems"); particle_system_manager->device_update(device, &dscene, this, progress); - if(progress.get_cancel()) return; progress.set_status("Updating Film"); |