sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Fix for builtin textures when linking against OSL 1.6.8

Browse Source 
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.
This commit is contained in:
Sergey Sharybin 2015-10-05 12:52:07 +05:00
parent 2a2e12772c
commit a771e27b84
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/osl/osl_services.h
View 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*/,