diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-17 14:54:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-17 14:54:19 +0300 |
| commit | e69192968616b17709e6a3bd0d2dc59d463c52ba (patch) | |
| tree | 4018a1dc7f631ad340b11c0b738fade9f24d0c6e /intern/cycles/render/light.cpp | |
| parent | 0af22625c9f9357e873160d265b9eae4a43a549d (diff) | |
| parent | 9d2397c710af9180e7e2ec6db42e8513390b4ab1 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render/light.cpp')
| -rw-r--r-- | intern/cycles/render/light.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index a5854f022cd..755b941717e 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -185,7 +185,7 @@ LightManager::~LightManager() bool LightManager::has_background_light(Scene *scene) { foreach(Light *light, scene->lights) { - if(light->type == LIGHT_BACKGROUND) { + if(light->type == LIGHT_BACKGROUND && light->is_enabled) { return true; } } @@ -211,8 +211,7 @@ void LightManager::disable_ineffective_light(Device *device, Scene *scene) * - If we don't need it (no HDRs etc.) */ Shader *shader = (scene->background->shader) ? scene->background->shader : scene->default_background; - bool disable_mis = !(has_portal || shader->has_surface_spatial_varying) || - !(device->info.advanced_shading); + bool disable_mis = !(has_portal || shader->has_surface_spatial_varying); if(disable_mis) { VLOG(1) << "Background MIS has been disabled.\n"; foreach(Light *light, scene->lights) { |