From e17f7af0ce7e045e287b517f775a282a7d7cc8c1 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 16 Mar 2019 16:06:36 +0100 Subject: Cleanup: remove Cycles advanced shading features toggle. It's effectively always enabled, only not on some unsupported OpenCL devices. For testing those it's not useful to disable these features. This is replaced by the more fine grained feature toggles that we have now. --- intern/cycles/render/light.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'intern/cycles/render/light.cpp') diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index 3580f4a8eeb..f60fba65599 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -210,8 +210,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) { -- cgit v1.2.3 From 9c7517fb636da9c5a8b4eead09957f29db1a6687 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 17 Mar 2019 01:56:08 +0100 Subject: Fix Cycles OpenCL compile waiting unnecessarily for background shader. Makes preview kernel appear quicker when background color is fixed. --- intern/cycles/render/light.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/render/light.cpp') diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index f60fba65599..8073c622040 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -184,7 +184,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; } } -- cgit v1.2.3