From dadf31f0b85d778009602edca21234e90d85ad19 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Fri, 25 Jul 2014 11:23:15 +0200 Subject: [PATCH] One more fix for new OSL libs. --- intern/cycles/kernel/osl/osl_services.cpp | 2 +- intern/cycles/kernel/osl/osl_services.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index f5413337258..d5d995d490b 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -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) { diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 2100a33294f..34c8899d357 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -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;