diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-10-05 10:52:07 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-10-05 10:52:07 +0300 |
| commit | a771e27b8424b458b818e36cb68d6c426379922c (patch) | |
| tree | db4c0087763acfcf5d3a27405d293ef6e700d4d5 /intern | |
| parent | 2a2e12772cccd119e7a8771926730f4e66585fe8 (diff) | |
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.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index cb6f2311ad8..1734eaad261 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*/, |