diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-02-13 15:21:47 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-02-13 15:21:47 +0300 |
| commit | 83dc288689337efc0e3dabc249eec2507682c704 (patch) | |
| tree | 6f01e882ff998931ed864f460413ddbf53b2eb71 /intern/cycles/kernel | |
| parent | ae635771b2f9ebd94e2c3461362c0ed5a39ecce4 (diff) | |
Cleanup: Remove some OIIO code for versions prior to 1.5.
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 8f3c03602ce..f1f26de230b 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -926,17 +926,6 @@ bool OSLRenderServices::texture(ustring filename, status = true; } else { -#if OIIO_VERSION < 10500 - (void) dresultds; /* Ignored. */ - (void) dresultdt; /* Ignored. */ - status = ts->texture(texture_handle, - texture_thread_info, - options, - s, t, - dsdx, dtdx, - dsdy, dtdy, - result); -#else if(texture_handle != NULL) { status = ts->texture(texture_handle, texture_thread_info, @@ -958,7 +947,6 @@ bool OSLRenderServices::texture(ustring filename, result, dresultds, dresultdt); } -#endif } if(!status) { @@ -1019,17 +1007,6 @@ bool OSLRenderServices::texture3d(ustring filename, status = true; } else { -#if OIIO_VERSION < 10500 - (void) dresultds; /* Ignored. */ - (void) dresultdt; /* Ignored. */ - (void) dresultdr; /* Ignored. */ - status = ts->texture3d(texture_handle, - texture_thread_info, - options, - P, - dPdx, dPdy, dPdz, - result); -#else if(texture_handle != NULL) { status = ts->texture3d(texture_handle, texture_thread_info, @@ -1049,7 +1026,6 @@ bool OSLRenderServices::texture3d(ustring filename, result, dresultds, dresultdt, dresultdr); } -#endif } if(!status) { @@ -1084,14 +1060,9 @@ bool OSLRenderServices::environment(ustring filename, TextureOpt &options, OIIO::TextureSystem::TextureHandle *th = ts->get_texture_handle(filename, thread_info); -#if OIIO_VERSION < 10500 - bool status = ts->environment(th, thread_info, - options, R, dRdx, dRdy, result); -#else bool status = ts->environment(th, thread_info, options, R, dRdx, dRdy, nchannels, result); -#endif if(!status) { if(nchannels == 3 || nchannels == 4) { |