diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-01-31 21:38:09 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-01-31 21:38:09 +0400 |
| commit | d319d68c6584d90acc65e62fd94d34772710ab3a (patch) | |
| tree | d6af521566c8773a6f33562a9be5746d571056ce /intern | |
| parent | 7b6e78e48a63952a699b2af346d7ac6a131b15ad (diff) | |
OSL 1.3x / Windows 64:
* Added missing define into SConscript file. This also makes r54232 obsolete, so removing this again.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/osl/SConscript | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 9 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.h | 4 |
3 files changed, 1 insertions, 13 deletions
diff --git a/intern/cycles/kernel/osl/SConscript b/intern/cycles/kernel/osl/SConscript index fe7fec463a7..09899567128 100644 --- a/intern/cycles/kernel/osl/SConscript +++ b/intern/cycles/kernel/osl/SConscript @@ -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()) diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 4088904c338..92a023bd765 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -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) diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 5cd1056e352..50c50b9952c 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -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); |