[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52445] trunk/blender/intern/cycles/kernel /osl/osl_closures.h: Cycles: solve -Wmissing-declarations for osl kernel
Sergey Sharybin
sergey.vfx at gmail.com
Wed Nov 21 14:41:48 CET 2012
Revision: 52445
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52445
Author: nazgul
Date: 2012-11-21 13:41:47 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Cycles: solve -Wmissing-declarations for osl kernel
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/osl/osl_closures.h
Modified: trunk/blender/intern/cycles/kernel/osl/osl_closures.h
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_closures.h 2012-11-21 13:39:32 UTC (rev 52444)
+++ trunk/blender/intern/cycles/kernel/osl/osl_closures.h 2012-11-21 13:41:47 UTC (rev 52445)
@@ -66,6 +66,8 @@
new (data) classname(); \
}
+#define CLOSURE_PREPARE_STATIC(name, classname) static CLOSURE_PREPARE(name, classname)
+
#define TO_VEC3(v) (*(OSL::Vec3 *)&(v))
#define TO_COLOR3(v) (*(OSL::Color3 *)&(v))
#define TO_FLOAT3(v) make_float3(v[0], v[1], v[2])
@@ -151,7 +153,7 @@
} \
}; \
\
-ClosureParam *bsdf_##lower##_params() \
+static ClosureParam *bsdf_##lower##_params() \
{ \
static ClosureParam params[] = {
@@ -164,7 +166,7 @@
return params; \
} \
\
-CLOSURE_PREPARE(bsdf_##lower##_prepare, Upper##Closure)
+CLOSURE_PREPARE_STATIC(bsdf_##lower##_prepare, Upper##Closure)
CCL_NAMESPACE_END
More information about the Bf-blender-cvs
mailing list