forked from bartvdbraak/blender
Cleanup: Remove some OIIO code for versions prior to 1.5.
This commit is contained in:
parent
ae635771b2
commit
83dc288689
@ -926,17 +926,6 @@ bool OSLRenderServices::texture(ustring filename,
|
|||||||
status = true;
|
status = true;
|
||||||
}
|
}
|
||||||
else {
|
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) {
|
if(texture_handle != NULL) {
|
||||||
status = ts->texture(texture_handle,
|
status = ts->texture(texture_handle,
|
||||||
texture_thread_info,
|
texture_thread_info,
|
||||||
@ -958,7 +947,6 @@ bool OSLRenderServices::texture(ustring filename,
|
|||||||
result,
|
result,
|
||||||
dresultds, dresultdt);
|
dresultds, dresultdt);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!status) {
|
if(!status) {
|
||||||
@ -1019,17 +1007,6 @@ bool OSLRenderServices::texture3d(ustring filename,
|
|||||||
status = true;
|
status = true;
|
||||||
}
|
}
|
||||||
else {
|
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) {
|
if(texture_handle != NULL) {
|
||||||
status = ts->texture3d(texture_handle,
|
status = ts->texture3d(texture_handle,
|
||||||
texture_thread_info,
|
texture_thread_info,
|
||||||
@ -1049,7 +1026,6 @@ bool OSLRenderServices::texture3d(ustring filename,
|
|||||||
result,
|
result,
|
||||||
dresultds, dresultdt, dresultdr);
|
dresultds, dresultdt, dresultdr);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!status) {
|
if(!status) {
|
||||||
@ -1084,14 +1060,9 @@ bool OSLRenderServices::environment(ustring filename, TextureOpt &options,
|
|||||||
|
|
||||||
OIIO::TextureSystem::TextureHandle *th = ts->get_texture_handle(filename, thread_info);
|
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,
|
bool status = ts->environment(th, thread_info,
|
||||||
options, R, dRdx, dRdy,
|
options, R, dRdx, dRdy,
|
||||||
nchannels, result);
|
nchannels, result);
|
||||||
#endif
|
|
||||||
|
|
||||||
if(!status) {
|
if(!status) {
|
||||||
if(nchannels == 3 || nchannels == 4) {
|
if(nchannels == 3 || nchannels == 4) {
|
||||||
|
Loading…
Reference in New Issue
Block a user