-- Clean-up of Effect and Particle modules; since particle was the only

   remaining effect type, it didn't make much sense to leave things
   implemented in two separate files.  Changes include:
   * two bug fixes (the getChild() and getMat() methods were using floats
   instead of shorts)
   * performing clamping on input values
   * implementing attributes using tp_getset
   * merging Effect and Particle functions: the Particle module exists in
   name only, with the Particle.New() and Particle.Get() functions
   remaining for backward compatibility (they are in fact identical to
   Effect.New() and Effect.Get() functions)
   * update of doc/Effect.py (including remove all old references to wave
   and build effects)

1 files changed, 3 insertions, 25 deletions

diff --git a/source/blender/python/api2_2x/Effect.h b/source/blender/python/api2_2x/Effect.h
index 11260c9576e..594ebda1813 100644
--- a/source/blender/python/api2_2x/Effect.h
+++ b/source/blender/python/api2_2x/Effect.h
@@ -43,36 +43,14 @@ extern PyTypeObject Effect_Type;
 /* Python BPy_Effect structure definition */
 typedef struct {
 	PyObject_HEAD		/* required py macro */
-	Effect * effect;
+	PartEff * effect;
 } BPy_Effect;
 
-
-/*****************************************************************************/
-/* Python API function prototypes for the Effect module.                     */
-/*****************************************************************************/
-PyObject *M_Effect_New( PyObject * self, PyObject * args );
-PyObject *M_Effect_Get( PyObject * self, PyObject * args );
-
-
-
 /*****************************************************************************/
-/* Python BPy_Effect methods declarations:                                   */
+/* Python Effect_Type helpder function prototypes:                           */
 /*****************************************************************************/
-/*PyObject *Effect_getType(BPy_Effect *self);*/
-
-
-/*****************************************************************************/
-/* Python Effect_Type callback function prototypes:                          */
-/*****************************************************************************/
-
 PyObject *Effect_Init( void );
-void EffectDeAlloc( BPy_Effect * msh );
-//int EffectPrint (BPy_Effect *msh, FILE *fp, int flags);
-int EffectSetAttr( BPy_Effect * msh, char *name, PyObject * v );
-PyObject *EffectGetAttr( BPy_Effect * msh, char *name );
-PyObject *EffectRepr( BPy_Effect * msh );
-PyObject *EffectCreatePyObject( struct Effect *effect );
 int EffectCheckPyObject( PyObject * py_obj );
-struct Effect *EffectFromPyObject( PyObject * py_obj );
+PyObject *EffectCreatePyObject( Effect * eff );
 
 #endif				/* EXPP_EFFECT_H */