blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cleanup: Remove some OIIO code for versions prior to 1.5.

This commit is contained in:
Thomas Dinges 2016-02-13 13:21:47 +01:00
parent ae635771b2
commit 83dc288689
1 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
intern/cycles/kernel/osl/osl_services.cpp
View File

@ -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) {