1 files changed, 29 insertions, 45 deletions
diff --git a/intern/cycles/kernel/osl/bsdf_microfacet.cpp b/intern/cycles/kernel/osl/bsdf_microfacet.cpp
index 8446dbbe982..09730d8c3e1 100644
--- a/intern/cycles/kernel/osl/bsdf_microfacet.cpp
+++ b/intern/cycles/kernel/osl/bsdf_microfacet.cpp
@@ -503,51 +503,35 @@ public:
 
 
 
-ClosureParam *bsdf_microfacet_ggx_params()
-{
-	static ClosureParam params[] = {
-	    CLOSURE_VECTOR_PARAM(MicrofacetGGXClosure<0>, m_N),
-	    CLOSURE_FLOAT_PARAM(MicrofacetGGXClosure<0>, m_ag),
-	    CLOSURE_STRING_KEYPARAM("label"),
-	    CLOSURE_FINISH_PARAM(MicrofacetGGXClosure<0>)
-	};
-	return params;
-}
-
-ClosureParam *bsdf_microfacet_ggx_refraction_params()
-{
-	static ClosureParam params[] = {
-	    CLOSURE_VECTOR_PARAM(MicrofacetGGXClosure<1>, m_N),
-	    CLOSURE_FLOAT_PARAM(MicrofacetGGXClosure<1>, m_ag),
-	    CLOSURE_FLOAT_PARAM(MicrofacetGGXClosure<1>, m_eta),
-	    CLOSURE_STRING_KEYPARAM("label"),
-	    CLOSURE_FINISH_PARAM(MicrofacetGGXClosure<1>)
-	};
-	return params;
-}
-
-ClosureParam *bsdf_microfacet_beckmann_params()
-{
-	static ClosureParam params[] = {
-	    CLOSURE_VECTOR_PARAM(MicrofacetBeckmannClosure<0>, m_N),
-	    CLOSURE_FLOAT_PARAM(MicrofacetBeckmannClosure<0>, m_ab),
-	    CLOSURE_STRING_KEYPARAM("label"),
-	    CLOSURE_FINISH_PARAM(MicrofacetBeckmannClosure<0>)
-	};
-	return params;
-}
-
-ClosureParam *bsdf_microfacet_beckmann_refraction_params()
-{
-	static ClosureParam params[] = {
-	    CLOSURE_VECTOR_PARAM(MicrofacetBeckmannClosure<1>, m_N),
-	    CLOSURE_FLOAT_PARAM(MicrofacetBeckmannClosure<1>, m_ab),
-	    CLOSURE_FLOAT_PARAM(MicrofacetBeckmannClosure<1>, m_eta),
-	    CLOSURE_STRING_KEYPARAM("label"),
-	    CLOSURE_FINISH_PARAM(MicrofacetBeckmannClosure<1>)
-	};
-	return params;
-}
+ClosureParam bsdf_microfacet_ggx_params[] = {
+	CLOSURE_VECTOR_PARAM(MicrofacetGGXClosure<0>, m_N),
+	CLOSURE_FLOAT_PARAM(MicrofacetGGXClosure<0>, m_ag),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(MicrofacetGGXClosure<0>)
+};
+
+ClosureParam bsdf_microfacet_ggx_refraction_params[] = {
+	CLOSURE_VECTOR_PARAM(MicrofacetGGXClosure<1>, m_N),
+	CLOSURE_FLOAT_PARAM(MicrofacetGGXClosure<1>, m_ag),
+	CLOSURE_FLOAT_PARAM(MicrofacetGGXClosure<1>, m_eta),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(MicrofacetGGXClosure<1>)
+};
+
+ClosureParam bsdf_microfacet_beckmann_params[] = {
+	CLOSURE_VECTOR_PARAM(MicrofacetBeckmannClosure<0>, m_N),
+	CLOSURE_FLOAT_PARAM(MicrofacetBeckmannClosure<0>, m_ab),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(MicrofacetBeckmannClosure<0>)
+};
+
+ClosureParam bsdf_microfacet_beckmann_refraction_params[] = {
+	CLOSURE_VECTOR_PARAM(MicrofacetBeckmannClosure<1>, m_N),
+	CLOSURE_FLOAT_PARAM(MicrofacetBeckmannClosure<1>, m_ab),
+	CLOSURE_FLOAT_PARAM(MicrofacetBeckmannClosure<1>, m_eta),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(MicrofacetBeckmannClosure<1>)
+};
 
 CLOSURE_PREPARE(bsdf_microfacet_ggx_prepare,                 MicrofacetGGXClosure<0>)
 CLOSURE_PREPARE(bsdf_microfacet_ggx_refraction_prepare,      MicrofacetGGXClosure<1>)