Another step in the Big Bpy Cleanup.

- move static declarations and data definitions out of headers.
  the BGL module still need cleaning.

- move declarations out of modules.h and into appropriate .h files.
  modules.h still exists as a container for the few modules that
  need to #include almost everything.

- all files now have a $Id tag and have been formatted by indent

there are no changes to executable code.

pre-commit versions are tagged with bpy-cleanup-pre-20041007
for the sake of paranoia.

1 files changed, 4 insertions, 122 deletions

diff --git a/source/blender/python/api2_2x/bpy_types.h b/source/blender/python/api2_2x/bpy_types.h
index 2c409d4ab78..d8144de5bb7 100644
--- a/source/blender/python/api2_2x/bpy_types.h
+++ b/source/blender/python/api2_2x/bpy_types.h
@@ -34,186 +34,68 @@
 
 #include <Python.h>
 
-#include <DNA_camera_types.h>
-#include <DNA_lamp_types.h>
-#include <DNA_ipo_types.h>
-#include <DNA_meta_types.h>
-#include <DNA_effect_types.h>
+
+
+
 #include <DNA_curve_types.h>
-#include <DNA_world_types.h>
 
-#include "rgbTuple.h"		/* for BPy_rgbTuple */
+
 
 /*****************************************************************************/
 /* Camera Data                                                               */
 /*****************************************************************************/
-extern PyTypeObject Camera_Type;
-
-#define BPy_Camera_Check(v) \
-    ((v)->ob_type == &Camera_Type)	/* for type checking */
-
-/* Python BPy_Camera structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	Camera * camera;
 
-} BPy_Camera;
 
 /*****************************************************************************/
 /* Lamp Data                                                                 */
 /*****************************************************************************/
-extern PyTypeObject Lamp_Type;
-
-#define BPy_Lamp_Check(v) \
-    ((v)->ob_type == &Lamp_Type)	/* for type checking */
-
-/* Python BPy_Lamp structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	Lamp * lamp;
-	BPy_rgbTuple *color;
-} BPy_Lamp;
 
 /*****************************************************************************/
 /* Ipo Data                                                                 */
 /*****************************************************************************/
-extern PyTypeObject Ipo_Type;
 
-#define BPy_Ipo_Check(v)  ((v)->ob_type == &Ipo_Type)	/* for type checking */
 
-/* Python BPy_Ipo structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	Ipo * ipo;
-} BPy_Ipo;
 
 /*****************************************************************************/
 /* Metaball Data                                                             */
 /*****************************************************************************/
-extern PyTypeObject Metaball_Type;
-
-#define BPy_Metaball_Check(v) ((v)->ob_type==&Metaball_Type)
 
-/* Python BPy_Metaball structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	MetaBall * metaball;
-} BPy_Metaball;
 
 /*****************************************************************************/
 /* Metaelem Data                                                             */
 /*****************************************************************************/
-extern PyTypeObject Metaelem_Type;
 
-#define BPy_Metaelem_Check(v) ((v)->ob_type==&Metaelem_Type)
-
-/* Python BPy_Metaelem structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	MetaElem * metaelem;
-} BPy_Metaelem;
 
 /*****************************************************************************/
 /* Effect Data                                                             */
 /*****************************************************************************/
-extern PyTypeObject Effect_Type;
-
-#define BPy_Effect_Check(v) ((v)->ob_type==&Effect_Type)
-
-/* Python BPy_Effect structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	Effect * effect;
-} BPy_Effect;
 
 /*****************************************************************************/
 /* Wave Data                                                             */
 /*****************************************************************************/
-extern PyTypeObject Wave_Type;
 
-#define BPy_Wave_Check(v) ((v)->ob_type==&Wave_Type)
-
-/* Python BPy_Wave structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	Effect * wave;
-} BPy_Wave;
 
 /*****************************************************************************/
 /* Build Data                                                             */
 /*****************************************************************************/
-extern PyTypeObject Build_Type;
-
-#define BPy_Build_Check(v) ((v)->ob_type==&Build_Type)
 
-/* Python BPy_Build structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	Effect * build;
-} BPy_Build;
 
 /*****************************************************************************/
 /* Particle Data                                                             */
 /*****************************************************************************/
-extern PyTypeObject Particle_Type;
-
-#define BPy_Particle_Check(v) ((v)->ob_type==&Particle_Type)
-
-/* Python BPy_Particle structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	Effect * particle;
-} BPy_Particle;
 
 /*****************************************************************************/
 /* Curve Data                                                             */
 /*****************************************************************************/
-extern PyTypeObject Curve_Type;
-
-#define BPy_Curve_Check(v) ((v)->ob_type==&Curve_Type)
-
-/* Python BPy_Curve structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	Curve * curve;
-	/* pointer for iterator:  does not point to owned memory */
-	Nurb *iter_pointer;
-} BPy_Curve;
 
 /**********
   CurNurb data
 ***********/
 
-extern PyTypeObject CurNurb_Type;
-
-#define BPy_CurNurb_Check(v)  ((v)->ob_type == &CurNurb_Type)	/* for type checking */
-
-/* Python BPy_CurNurb structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	Nurb * nurb;		/* pointer to Blender data */
-
-	/* iterator stuff */
-	/* internal ptrs to point data.  do not free */
-	BPoint *bp;
-	BezTriple *bezt;
-	int atEnd;		/* iter exhausted flag  */
-	int nextPoint;
-
-} BPy_CurNurb;
-
 
 /*****************************************************************************/
 /* World Data                                                             */
 /*****************************************************************************/
-extern PyTypeObject World_Type;
-
-#define BPy_World_Check(v) ((v)->ob_type==&World_Type)
 
-/* Python BPy_World structure definition */
-typedef struct {
-	PyObject_HEAD		/* required py macro */
-	World * world;
-} BPy_World;
 
 #endif				/* EXPP_bpy_types_h */