Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-14 01:40:25 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-14 01:40:25 +0300
commitf070bdd7c9c4991f355431a44fdc2d85d4338cd0 (patch)
tree86a71e845c3172201d0e656806583c25eab3b068 /intern/cycles
parent2ff7494e6d51116f8a408ed8b3d559aa9d9db291 (diff)
Fix T63802: textured lights not working with OSL
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/kernel/kernel_shader.h2
1 files changed, 1 insertions, 1 deletions
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 {