[Bf-blender-cvs] [a771e27] master: Cycles: Fix for builtin textures when linking against OSL 1.6.8

[Sergey Sharybin]

Commit: a771e27b8424b458b818e36cb68d6c426379922c
Author: Sergey Sharybin
Date:   Mon Oct 5 12:52:07 2015 +0500
Branches: master
https://developer.blender.org/rBa771e27b8424b458b818e36cb68d6c426379922c

Cycles: Fix for builtin textures when linking against OSL 1.6.8

Issue was caused by changed function signature. This is still not really full
support of new OSL API since we don't store anything in the derivatives which
could confuse mipmapping.

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

M	intern/cycles/kernel/osl/osl_services.h

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

diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h
index cb6f231..1734eaa 100644
--- a/intern/cycles/kernel/osl/osl_services.h
+++ b/intern/cycles/kernel/osl/osl_services.h
@@ -104,7 +104,7 @@ public:
 	               const OSL::Vec3 &dPdx, const OSL::Vec3 &dPdy,
 	               const OSL::Vec3 &dPdz, int nchannels, float *result);
 
-#if OSL_LIBRARY_VERSION_CODE >= 10700
+#if OSL_LIBRARY_VERSION_CODE >= 10600
 	bool texture(ustring filename,
 	             TextureHandle * /*texture_handle*/,
 	             TexturePerthread * /*texture_thread_info*/,