[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54238] trunk/blender/intern/cycles/kernel /osl: OSL 1.3x / Windows 64:
Thomas Dinges
blender at dingto.org
Thu Jan 31 18:38:11 CET 2013
Revision: 54238
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54238
Author: dingto
Date: 2013-01-31 17:38:09 +0000 (Thu, 31 Jan 2013)
Log Message:
-----------
OSL 1.3x / Windows 64:
* Added missing define into SConscript file. This also makes r54232 obsolete, so removing this again.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54232
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/osl/SConscript
trunk/blender/intern/cycles/kernel/osl/osl_services.cpp
trunk/blender/intern/cycles/kernel/osl/osl_services.h
Modified: trunk/blender/intern/cycles/kernel/osl/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/SConscript 2013-01-31 16:19:44 UTC (rev 54237)
+++ trunk/blender/intern/cycles/kernel/osl/SConscript 2013-01-31 17:38:09 UTC (rev 54238)
@@ -46,6 +46,7 @@
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())
Modified: trunk/blender/intern/cycles/kernel/osl/osl_services.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_services.cpp 2013-01-31 16:19:44 UTC (rev 54237)
+++ trunk/blender/intern/cycles/kernel/osl/osl_services.cpp 2013-01-31 17:38:09 UTC (rev 54238)
@@ -328,15 +328,6 @@
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)
Modified: trunk/blender/intern/cycles/kernel/osl/osl_services.h
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_services.h 2013-01-31 16:19:44 UTC (rev 54237)
+++ trunk/blender/intern/cycles/kernel/osl/osl_services.h 2013-01-31 17:38:09 UTC (rev 54238)
@@ -59,10 +59,6 @@
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);
More information about the Bf-blender-cvs
mailing list