OSL 1.3x / Windows 64:
authorThomas Dinges <blender@dingto.org>
Thu, 31 Jan 2013 17:38:09 +0000 (17:38 +0000)
committerThomas Dinges <blender@dingto.org>
Thu, 31 Jan 2013 17:38:09 +0000 (17:38 +0000)
* Added missing define into SConscript file. This also makes r54232 obsolete, so removing this again.

intern/cycles/kernel/osl/SConscript
intern/cycles/kernel/osl/osl_services.cpp
intern/cycles/kernel/osl/osl_services.h

index fe7fec4..0989956 100644 (file)
@@ -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())
 
index 4088904..92a023b 100644 (file)
@@ -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)
index 5cd1056..50c50b9 100644 (file)
@@ -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);