diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-07-25 13:42:21 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-07-25 13:42:21 +0400 |
| commit | c0a9337caab2a2ae40959bac4a97830badbe593d (patch) | |
| tree | f7fffdec5b09158b73e0a2dfe18f0bb50c3adb1c /intern/cycles/kernel/osl/osl_services.h | |
| parent | 6cff19a0bfd77c52825e8adaf50f4bd56abe3932 (diff) | |
Yet another OSL compilation fix...sorry.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_services.h')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.h | 5 |
1 files changed, 2 insertions, 3 deletions
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: |