[Bf-blender-cvs] [f070bdd7c9c] master: Fix T63802: textured lights not working with OSL

Brecht Van Lommel noreply at git.blender.org
Tue May 14 00:45:44 CEST 2019


Commit: f070bdd7c9c4991f355431a44fdc2d85d4338cd0
Author: Brecht Van Lommel
Date:   Tue May 14 00:40:25 2019 +0200
Branches: master
https://developer.blender.org/rBf070bdd7c9c4991f355431a44fdc2d85d4338cd0

Fix T63802: textured lights not working with OSL

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

M	intern/cycles/kernel/kernel_shader.h

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

diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index 351b623addb..c80124d3eb2 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -1092,7 +1092,7 @@ ccl_device void shader_eval_surface(KernelGlobals *kg,
 
 #ifdef __OSL__
   if (kg->osl) {
-    if (sd->object == OBJECT_NONE) {
+    if (sd->object == OBJECT_NONE && sd->lamp == LAMP_NONE) {
       OSLShader::eval_background(kg, sd, state, path_flag);
     }
     else {



More information about the Bf-blender-cvs mailing list