Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Attempt to fix cycles OSL link error on windows 64 bit.

Browse Source
This commit is contained in:
Brecht Van Lommel
2013-01-31 13:44:03 +00:00
parent 7d3c6b2760
commit 122a2084b5
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/kernel/osl/osl_services.cpp
View File

@@ -328,6 +328,15 @@ bool OSLRenderServices::get_inverse_matrix(OSL::Matrix44 &result, ustring to)
return false; 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, bool OSLRenderServices::get_array_attribute(void *renderstate, bool derivatives,
ustring object, TypeDesc type, ustring name, ustring object, TypeDesc type, ustring name,
int index, void *val) int index, void *val)

4
intern/cycles/kernel/osl/osl_services.h
View File

@@ -59,6 +59,10 @@ public:
bool get_matrix(OSL::Matrix44 &result, ustring from); bool get_matrix(OSL::Matrix44 &result, ustring from);
bool get_inverse_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, bool get_array_attribute(void *renderstate, bool derivatives,
ustring object, TypeDesc type, ustring name, ustring object, TypeDesc type, ustring name,
int index, void *val); int index, void *val);