end of cleanup ; naming conventions, balance between c and h files

1 files changed, 120 insertions, 1 deletions

diff --git a/source/blender/python/api2_2x/bpy_types.h b/source/blender/python/api2_2x/bpy_types.h
index ff8ed8699b7..f8dae9f438b 100644
--- a/source/blender/python/api2_2x/bpy_types.h
+++ b/source/blender/python/api2_2x/bpy_types.h
@@ -36,6 +36,11 @@
 
 #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 */
 
@@ -68,9 +73,123 @@ typedef struct {
   PyObject_HEAD
   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
+  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
+  MetaBall *metaball;
+} BPy_Metaball;
+/**/
+
+
+/*****************************************************************************/
+/* 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
+  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
+  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
+  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
+  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
+  Curve *curve;
+} BPy_Curve;
+/**/
+
+/*****************************************************************************/
+/* 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
+  World *world;
+} BPy_World;
+/**/
+
+
 #endif /* EXPP_bpy_types_h */