From c0a9337caab2a2ae40959bac4a97830badbe593d Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Fri, 25 Jul 2014 11:42:21 +0200 Subject: Yet another OSL compilation fix...sorry. --- intern/cycles/kernel/osl/osl_services.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'intern') diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 34c8899d357..024a8396060 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -216,10 +216,9 @@ public: return get_userdata(derivatives, name, type, (OSL::ShaderGlobals *) renderstate, val); } - bool get_texture_info(OSL::ShaderGlobals *sg, ustring filename, int subimage, + bool get_texture_info(ustring filename, int subimage, ustring dataname, TypeDesc datatype, void *data) { - return get_texture_info(NULL, filename, subimage, - dataname, datatype, *data); + return get_texture_info(NULL, filename, subimage, dataname, datatype, data); } #endif private: -- cgit v1.2.3