diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-31 17:44:03 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-31 17:44:03 +0400 |
commit | 122a2084b5c056befb6627a1d12ee337f0fe07fe (patch) | |
tree | b2732f052c318ff135951ca12e75550992eb7d0f /intern | |
parent | 7d3c6b27601e761b4aa4122a273bd9d308bff25d (diff) |
Attempt to fix cycles OSL link error on windows 64 bit.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 9 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/osl_services.h | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 92a023bd765..4088904c338 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -328,6 +328,15 @@ bool OSLRenderServices::get_inverse_matrix(OSL::Matrix44 &result, ustring to) return false; } +bool OSLRenderServices::transform_points(OSL::ShaderGlobals *sg, ustring from, + ustring to, float time, + const OSL::Vec3 *Pin, OSL::Vec3 *Pout, + int npoints, + TypeDesc::VECSEMANTICS vectype) +{ + return false; +} + bool OSLRenderServices::get_array_attribute(void *renderstate, bool derivatives, ustring object, TypeDesc type, ustring name, int index, void *val) diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 50c50b9952c..5cd1056e352 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -59,6 +59,10 @@ public: bool get_matrix(OSL::Matrix44 &result, ustring from); bool get_inverse_matrix(OSL::Matrix44 &result, ustring from); + bool transform_points(OSL::ShaderGlobals *sg, ustring from, ustring to, + float time, const OSL::Vec3 *Pin, OSL::Vec3 *Pout, int npoints, + TypeDesc::VECSEMANTICS vectype); + bool get_array_attribute(void *renderstate, bool derivatives, ustring object, TypeDesc type, ustring name, int index, void *val); |