forked from bartvdbraak/blender
One more fix for new OSL libs.
This commit is contained in:
parent
9a904a3857
commit
dadf31f0b8
@ -969,7 +969,7 @@ bool OSLRenderServices::environment(ustring filename, TextureOpt &options,
|
||||
return status;
|
||||
}
|
||||
|
||||
bool OSLRenderServices::get_texture_info(ustring filename, int subimage,
|
||||
bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *sg, ustring filename, int subimage,
|
||||
ustring dataname,
|
||||
TypeDesc datatype, void *data)
|
||||
{
|
||||
|
@ -106,7 +106,7 @@ public:
|
||||
OSL::ShaderGlobals *sg, const OSL::Vec3 &R,
|
||||
const OSL::Vec3 &dRdx, const OSL::Vec3 &dRdy, float *result);
|
||||
|
||||
bool get_texture_info(ustring filename, int subimage,
|
||||
bool get_texture_info(OSL::ShaderGlobals *sg, ustring filename, int subimage,
|
||||
ustring dataname, TypeDesc datatype, void *data);
|
||||
|
||||
static bool get_background_attribute(KernelGlobals *kg, ShaderData *sd, ustring name,
|
||||
@ -215,6 +215,12 @@ public:
|
||||
void *renderstate, void *val) {
|
||||
return get_userdata(derivatives, name, type, (OSL::ShaderGlobals *) renderstate, val);
|
||||
}
|
||||
|
||||
bool get_texture_info(OSL::ShaderGlobals *sg, ustring filename, int subimage,
|
||||
ustring dataname, TypeDesc datatype, void *data) {
|
||||
return get_texture_info(NULL, filename, subimage,
|
||||
dataname, datatype, *data);
|
||||
}
|
||||
#endif
|
||||
private:
|
||||
KernelGlobals *kernel_globals;
|
||||
|
Loading…
Reference in New Issue
Block a user