[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54232] trunk/blender/intern/cycles/kernel /osl: Attempt to fix cycles OSL link error on windows 64 bit.
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Jan 31 14:44:07 CET 2013
Revision: 54232
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54232
Author: blendix
Date: 2013-01-31 13:44:03 +0000 (Thu, 31 Jan 2013)
Log Message:
-----------
Attempt to fix cycles OSL link error on windows 64 bit.
Modified Paths:
--------------
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/osl_services.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_services.cpp 2013-01-31 12:54:06 UTC (rev 54231)
+++ trunk/blender/intern/cycles/kernel/osl/osl_services.cpp 2013-01-31 13:44:03 UTC (rev 54232)
@@ -328,6 +328,15 @@
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 12:54:06 UTC (rev 54231)
+++ trunk/blender/intern/cycles/kernel/osl/osl_services.h 2013-01-31 13:44:03 UTC (rev 54232)
@@ -59,6 +59,10 @@
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