[Bf-blender-cvs] [9c7517fb636] blender2.7: Fix Cycles OpenCL compile waiting unnecessarily for background shader.

Brecht Van Lommel noreply at git.blender.org
Sun Mar 17 12:05:25 CET 2019


Commit: 9c7517fb636da9c5a8b4eead09957f29db1a6687
Author: Brecht Van Lommel
Date:   Sun Mar 17 01:56:08 2019 +0100
Branches: blender2.7
https://developer.blender.org/rB9c7517fb636da9c5a8b4eead09957f29db1a6687

Fix Cycles OpenCL compile waiting unnecessarily for background shader.

Makes preview kernel appear quicker when background color is fixed.

===================================================================

M	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;
 		}
 	}



More information about the Bf-blender-cvs mailing list