Commit: 5bfc32bab4dc974d151e2d04c8c23e6c740101ef
Author: Campbell Barton
Date: Mon Nov 30 10:09:44 2015 +1100
Branches: master
https://developer.blender.org/rB5bfc32bab4dc974d151e2d04c8c23e6c740101ef
Cleanup: warning w/ unknown define
===================================================================
M intern/cycles/render/nodes.cpp
===================================================================
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index e661b0b..cece0c3 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -4478,7 +4478,7 @@ void OSLScriptNode::compile(SVMCompiler& /*compiler*/)
void OSLScriptNode::compile(OSLCompiler& compiler)
{
-#if OSL_LIBRARY_VERSION_CODE < 10701
+#if defined(WITH_OSL) && (OSL_LIBRARY_VERSION_CODE < 10701)
/* XXX fix for #36790:
* point and normal parameters are reflected as generic SOCK_VECTOR
sockets
* on the node. Socket fixed input values need to be copied explicitly
here for
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
