Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

One more fix for new OSL libs.

Browse Source
This commit is contained in:
Thomas Dinges
2014-07-25 11:23:15 +02:00
parent 9a904a3857
commit dadf31f0b8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -969,7 +969,7 @@ bool OSLRenderServices::environment(ustring filename, TextureOpt &options,
return status; 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, ustring dataname,
TypeDesc datatype, void *data) TypeDesc datatype, void *data)
{ {

8
intern/cycles/kernel/osl/osl_services.h
View File

@@ -106,7 +106,7 @@ public:
OSL::ShaderGlobals *sg, const OSL::Vec3 &R, OSL::ShaderGlobals *sg, const OSL::Vec3 &R,
const OSL::Vec3 &dRdx, const OSL::Vec3 &dRdy, float *result); 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); ustring dataname, TypeDesc datatype, void *data);
static bool get_background_attribute(KernelGlobals *kg, ShaderData *sd, ustring name, static bool get_background_attribute(KernelGlobals *kg, ShaderData *sd, ustring name,
@@ -215,6 +215,12 @@ public:
void *renderstate, void *val) { void *renderstate, void *val) {
return get_userdata(derivatives, name, type, (OSL::ShaderGlobals *) renderstate, 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 #endif
private: private:
KernelGlobals *kernel_globals; KernelGlobals *kernel_globals;