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
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-11-30 02:09:44 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-30 03:03:49 +0300
commit5bfc32bab4dc974d151e2d04c8c23e6c740101ef (patch)
treeff2889a6fc5049540fdd5210e5be690a236e1405 /intern
parent5b90a6e188f78ee4544b528c55fb0f2a8f6e9fd6 (diff)
Cleanup: warning w/ unknown define
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/render/nodes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index e661b0b176e..cece0c37f59 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