Cycles: Fix for builtin textures when linking against OSL 1.6.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 5 Oct 2015 07:52:07 +0000 (12:52 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 5 Oct 2015 07:52:07 +0000 (12:52 +0500)
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.

intern/cycles/kernel/osl/osl_services.h

index cb6f2311ad820fb289bfab809b78749004544aa2..1734eaad2615ea8746d427e7c16906078c0518e2 100644 (file)
@@ -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*/,