[Bf-blender-cvs] [dadf31f] master: One more fix for new OSL libs.
Thomas Dinges
noreply at git.blender.org
Fri Jul 25 11:23:47 CEST 2014
Commit: dadf31f0b85d778009602edca21234e90d85ad19
Author: Thomas Dinges
Date: Fri Jul 25 11:23:15 2014 +0200
Branches: master
https://developer.blender.org/rBdadf31f0b85d778009602edca21234e90d85ad19
One more fix for new OSL libs.
===================================================================
M intern/cycles/kernel/osl/osl_services.cpp
M intern/cycles/kernel/osl/osl_services.h
===================================================================
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index f541333..d5d995d 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 2100a33..34c8899 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;
More information about the Bf-blender-cvs
mailing list