Commit: 63173dc7d526c07cd4e5a7aea1aa7546a60ae034
Author: Mai Lavelle
Date: Tue Nov 28 00:28:04 2017 -0500
Branches: split-kernel-faster-building
https://developer.blender.org/rB63173dc7d526c07cd4e5a7aea1aa7546a60ae034
Cycles: Fix build with OSL enabled
===================================================================
M intern/cycles/kernel/kernel_shader.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_shader.h
b/intern/cycles/kernel/kernel_shader.h
index c86e6690e28..3c84938a349 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -1012,6 +1012,7 @@ ccl_device void shader_eval(KernelGlobals *kg, ShaderData
*sd,
if(kg->osl) {
if(intent == SHADER_EVAL_INTENT_SURFACE) {
OSLShader::eval_surface(kg, sd, state, path_flag);
+ }
else if(intent == SHADER_EVAL_INTENT_BACKGROUND) {
OSLShader::eval_background(kg, sd, state, path_flag);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
