soc-2008-mxcurioni: corrected problems in API with UnaryFunction1DVoid subclasses and Curvature2DAngleF1D. Understood that Curve and Noise classes cannot be defined in Freestyle's API because they are already given by Blender's API. Will rename to FrsCurve and FrsNoise and change the corresponding style modules.

3 files changed, 17 insertions, 11 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
index 9ab0ce41fb3..10db0d93140 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
@@ -7,7 +7,7 @@
 #include "UnaryFunction1D/BPy_UnaryFunction1DVec2f.h"
 #include "UnaryFunction1D/BPy_UnaryFunction1DVec3f.h"
 #include "UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h"
-
+#include "UnaryFunction1D/BPy_UnaryFunction1DVoid.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -127,6 +127,7 @@ PyMODINIT_FUNC UnaryFunction1D_Init( PyObject *module )
 	UnaryFunction1DVec2f_Init( module );
 	UnaryFunction1DVec3f_Init( module );
 	UnaryFunction1DVectorViewShape_Init( module );
+	UnaryFunction1DVoid_Init( module );
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
index 5b6aed936b9..887d1273e60 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
@@ -147,6 +147,11 @@ PyMODINIT_FUNC UnaryFunction1DDouble_Init( PyObject *module ) {
 	Py_INCREF( &DensityF1D_Type );
 	PyModule_AddObject(module, "DensityF1D", (PyObject *)&DensityF1D_Type);
 
+	if( PyType_Ready( &Curvature2DAngleF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &Curvature2DAngleF1D_Type );
+	PyModule_AddObject(module, "Curvature2DAngleF1D", (PyObject *)&Curvature2DAngleF1D_Type);
+
 	if( PyType_Ready( &GetCompleteViewMapDensityF1D_Type ) < 0 )
 		return;
 	Py_INCREF( &GetCompleteViewMapDensityF1D_Type );
diff --git a/source/blender/freestyle/style_modules_blender/freestyle_init.py b/source/blender/freestyle/style_modules_blender/freestyle_init.py
index 5cc3448ca4d..8c45629bade 100644
--- a/source/blender/freestyle/style_modules_blender/freestyle_init.py
+++ b/source/blender/freestyle/style_modules_blender/freestyle_init.py
@@ -246,8 +246,8 @@ class UnaryFunction1DVec3f(Blender.Freestyle.UnaryFunction1DVec3f):
 class UnaryFunction1DVectorViewShape(Blender.Freestyle.UnaryFunction1DVectorViewShape):
 	pass
 
-# class UnaryFunction1DVoid(Blender.Freestyle.UnaryFunction1DVoid):
-# 	pass
+class UnaryFunction1DVoid(Blender.Freestyle.UnaryFunction1DVoid):
+	pass
 
 class FalseUP0D(Blender.Freestyle.FalseUP0D):
 	def __call__(*args): return Blender.Freestyle.FalseUP0D.__call__(*args)
@@ -378,8 +378,8 @@ class GetOccludeeF0D(Blender.Freestyle.GetOccludeeF0D):
 class GetShapeF0D(Blender.Freestyle.GetShapeF0D):
 	def __call__(*args): return Blender.Freestyle.GetShapeF0D.__call__(*args)
 
-# class Curvature2DAngleF1D(Blender.Freestyle.Curvature2DAngleF1D):
-# 	def __call__(*args): return Blender.Freestyle.Curvature2DAngleF1D.__call__(*args)
+class Curvature2DAngleF1D(Blender.Freestyle.Curvature2DAngleF1D):
+	def __call__(*args): return Blender.Freestyle.Curvature2DAngleF1D.__call__(*args)
 
 class DensityF1D(Blender.Freestyle.DensityF1D):
 	def __call__(*args): return Blender.Freestyle.DensityF1D.__call__(*args)
@@ -444,12 +444,12 @@ class GetOccludersF1D(Blender.Freestyle.GetOccludersF1D):
 class GetShapeF1D(Blender.Freestyle.GetShapeF1D):
 	def __call__(*args): return Blender.Freestyle.GetShapeF1D.__call__(*args)
 
-# class ChainingTimeStampF1D(Blender.Freestyle.ChainingTimeStampF1D):
-# 	def __call__(*args): return Blender.Freestyle.ChainingTimeStampF1D.__call__(*args)
+class ChainingTimeStampF1D(Blender.Freestyle.ChainingTimeStampF1D):
+	def __call__(*args): return Blender.Freestyle.ChainingTimeStampF1D.__call__(*args)
 
-# class IncrementChainingTimeStampF1D(Blender.Freestyle.IncrementChainingTimeStampF1D):
-# 	def __call__(*args): return Blender.Freestyle.IncrementChainingTimeStampF1D.__call__(*args)
+class IncrementChainingTimeStampF1D(Blender.Freestyle.IncrementChainingTimeStampF1D):
+	def __call__(*args): return Blender.Freestyle.IncrementChainingTimeStampF1D.__call__(*args)
 
-# class TimeStampF1D(Blender.Freestyle.TimeStampF1D):
-# 	def __call__(*args): return Blender.Freestyle.TimeStampF1D.__call__(*args)
+class TimeStampF1D(Blender.Freestyle.TimeStampF1D):
+	def __call__(*args): return Blender.Freestyle.TimeStampF1D.__call__(*args)