forked from bartvdbraak/blender
OSL 1.3x / Windows 64:
* Added missing define into SConscript file. This also makes r54232 obsolete, so removing this again.
This commit is contained in:
parent
7b6e78e48a
commit
d319d68c65
@ -46,6 +46,7 @@ defs.append('WITH_OSL')
|
||||
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
|
||||
cxxflags.append('-DBOOST_NO_RTTI -DBOOST_NO_TYPEID'.split())
|
||||
incs.append(env['BF_PTHREADS_INC'])
|
||||
defs.append('OSL_STATIC_LIBRARY')
|
||||
else:
|
||||
cxxflags.append('-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID'.split())
|
||||
|
||||
|
@ -328,15 +328,6 @@ 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)
|
||||
|
@ -59,10 +59,6 @@ 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);
|
||||
|
Loading…
Reference in New Issue
Block a user