python api renaming and added headers for some files which didnt have one, no functio...
authorCampbell Barton <ideasman42@gmail.com>
Mon, 14 Feb 2011 04:15:25 +0000 (04:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 14 Feb 2011 04:15:25 +0000 (04:15 +0000)
40 files changed:
source/blender/python/generic/CMakeLists.txt
source/blender/python/generic/IDProp.c
source/blender/python/generic/IDProp.h
source/blender/python/generic/bgl.c
source/blender/python/generic/bgl.h
source/blender/python/generic/mathutils.c
source/blender/python/generic/mathutils.h
source/blender/python/generic/mathutils_Color.c [moved from source/blender/python/generic/mathutils_color.c with 99% similarity]
source/blender/python/generic/mathutils_Color.h [moved from source/blender/python/generic/mathutils_color.h with 98% similarity]
source/blender/python/generic/mathutils_Euler.c [moved from source/blender/python/generic/mathutils_euler.c with 99% similarity]
source/blender/python/generic/mathutils_Euler.h [moved from source/blender/python/generic/mathutils_euler.h with 98% similarity]
source/blender/python/generic/mathutils_Matrix.c [moved from source/blender/python/generic/mathutils_matrix.c with 99% similarity]
source/blender/python/generic/mathutils_Matrix.h [moved from source/blender/python/generic/mathutils_matrix.h with 99% similarity]
source/blender/python/generic/mathutils_Quaternion.c [moved from source/blender/python/generic/mathutils_quat.c with 99% similarity]
source/blender/python/generic/mathutils_Quaternion.h [moved from source/blender/python/generic/mathutils_quat.h with 98% similarity]
source/blender/python/generic/mathutils_Vector.c [moved from source/blender/python/generic/mathutils_vector.c with 99% similarity]
source/blender/python/generic/mathutils_Vector.h [moved from source/blender/python/generic/mathutils_vector.h with 98% similarity]
source/blender/python/generic/mathutils_geometry.c
source/blender/python/generic/mathutils_geometry.h
source/blender/python/generic/noise_py_api.c [moved from source/blender/python/generic/noise.c with 99% similarity]
source/blender/python/generic/noise_py_api.h [new file with mode: 0644]
source/blender/python/generic/py_capi_utils.c
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy_app.c
source/blender/python/intern/bpy_app.h
source/blender/python/intern/bpy_driver.h [new file with mode: 0644]
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_operator.c
source/blender/python/intern/bpy_operator.h
source/blender/python/intern/bpy_operator_wrap.c
source/blender/python/intern/bpy_operator_wrap.h
source/blender/python/intern/bpy_props.c
source/blender/python/intern/bpy_props.h
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_rna.h
source/blender/python/intern/bpy_rna_array.c
source/blender/python/intern/bpy_rna_callback.c
source/blender/python/intern/bpy_util.c
source/blender/python/intern/bpy_util.h

index 58d69db4a0eaed1a596133d411718302795051d8..b3dec148e9dea7e6eabe6b0ccd7a57afb676f4c2 100644 (file)
@@ -34,13 +34,13 @@ set(SRC
        blf_py_api.c
        bpy_internal_import.c
        mathutils.c
-       mathutils_color.c
-       mathutils_euler.c
+       mathutils_Color.c
+       mathutils_Euler.c
+       mathutils_Matrix.c
+       mathutils_Quaternion.c
+       mathutils_Vector.c
        mathutils_geometry.c
-       mathutils_matrix.c
-       mathutils_quat.c
-       mathutils_vector.c
-       noise.c
+       noise_py_api.c
        py_capi_utils.c
 
        IDProp.h
@@ -48,13 +48,15 @@ set(SRC
        blf_py_api.h
        bpy_internal_import.h
        mathutils.h
-       mathutils_color.h
-       mathutils_euler.h
+       mathutils_Color.h
+       mathutils_Euler.h
+       mathutils_Matrix.h
+       mathutils_Quaternion.h
+       mathutils_Vector.h
        mathutils_geometry.h
-       mathutils_matrix.h
-       mathutils_quat.h
-       mathutils_vector.h
+       noise_py_api.h
        py_capi_utils.h
 )
 
+
 blender_add_lib(bf_python_ext "${SRC}" "${INC}")
index ad0c96afa17e57f165e336352ee0d6fb7f45d9cf..8004af95050363d19962ddf4de306d22944f0ef9 100644 (file)
@@ -23,6 +23,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
+
 #include "IDProp.h"
 #include "MEM_guardedalloc.h"
 
index cd5bff4788e17486866c89c6c531cbe8e024348a..b0a3b894f086151c2f77176ab1dae9236f5b68e4 100644 (file)
@@ -22,7 +22,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include <Python.h>
+#ifndef IDPROP_H
+#define IDPROP_H
 
 struct ID;
 struct IDProperty;
@@ -62,3 +63,5 @@ void IDProp_Init_Types(void);
 
 #define IDPROP_ITER_KEYS       0
 #define IDPROP_ITER_ITEMS      1
+
+#endif /* IDPROP_H */
index 2b15a6f48261e47e1310e3a4e0a6d20c8a8a8799..63d310ae4e0d255ac155f01e0d3e788bb320602d 100644 (file)
@@ -31,6 +31,8 @@
  * The BGL submodule "wraps" OpenGL functions and constants,
  * allowing script writers to make OpenGL calls in their Python scripts. */
 
+#include <Python.h>
+
 #include "bgl.h" /*This must come first */
 #include <GL/glew.h>
 #include "MEM_guardedalloc.h"
@@ -38,7 +40,6 @@
 #include "BLI_utildefines.h"
 
 
-
 static char Method_Buffer_doc[] =
        "(type, dimensions, [template]) - Create a new Buffer object\n\n\
 (type) - The format to store data in\n\
index 049b3f101a013f92de5ec63fcb06e29268c40661..48462bc108e6cdde01caed1913c2bc8f953d8b37 100644 (file)
@@ -36,8 +36,6 @@
 #ifndef BGL_H
 #define BGL_H
 
-#include <Python.h>
-
 PyObject *BPyInit_bgl(void);
 
 /*@ Create a buffer object */
index f56ac6c61bf07d3e287f74e86c3fe53f8dfec070..0098335169b16542685bedf0ddd916f8631bc925 100644 (file)
@@ -87,6 +87,8 @@
  * - geometry.BarycentricTransform -> barycentric_transform
  */
 
+#include <Python.h>
+
 #include "mathutils.h"
 
 #include "BLI_math.h"
index 07342f8144bf6c049ca5fbfd962e85e77ed0fe6c..8442b66a1db562efebd0545aea4b01446611663d 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef MATHUTILS_H
 #define MATHUTILS_H
 
-#include <Python.h>
-
 /* Can cast different mathutils types to this, use for generic funcs */
 
 extern char BaseMathObject_Wrapped_doc[];
@@ -50,11 +48,11 @@ typedef struct {
        BASE_MATH_MEMBERS(data)
 } BaseMathObject;
 
-#include "mathutils_vector.h"
-#include "mathutils_matrix.h"
-#include "mathutils_quat.h"
-#include "mathutils_euler.h"
-#include "mathutils_color.h"
+#include "mathutils_Vector.h"
+#include "mathutils_Matrix.h"
+#include "mathutils_Quaternion.h"
+#include "mathutils_Euler.h"
+#include "mathutils_Color.h"
 #include "mathutils_geometry.h"
 
 PyObject *BaseMathObject_getOwner( BaseMathObject * self, void * );
similarity index 99%
rename from source/blender/python/generic/mathutils_color.c
rename to source/blender/python/generic/mathutils_Color.c
index f7e62242703a38c95d53bc8327b8abe3f796536a..1c870ead4389618894e6b497414c636ea08f8f56 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
+
 #include "mathutils.h"
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-
-
 #define COLOR_SIZE 3
 
 //----------------------------------mathutils.Color() -------------------
similarity index 98%
rename from source/blender/python/generic/mathutils_color.h
rename to source/blender/python/generic/mathutils_Color.h
index f3f185b29915f2d24b5dc613cee80ab6c2bf3336..619cccbe08516069ac505eeaa36af4344be4abc6 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef MATHUTILS_COLOR_H
 #define MATHUTILS_COLOR_H
 
-#include <Python.h>
-
 extern PyTypeObject color_Type;
 #define ColorObject_Check(_v) PyObject_TypeCheck((_v), &color_Type)
 
similarity index 99%
rename from source/blender/python/generic/mathutils_euler.c
rename to source/blender/python/generic/mathutils_Euler.c
index b604027406586acc869358e3db81bda557294b11..c42387f77fbde2a309e056f3a4c73f798407eb48 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
+
 #include "mathutils.h"
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-
-
 #ifndef int32_t
 #include "BLO_sys_types.h"
 #endif
similarity index 98%
rename from source/blender/python/generic/mathutils_euler.h
rename to source/blender/python/generic/mathutils_Euler.h
index fc4e4ddb66700d05ec0cc0d7a6ce6551ca58046d..1bb26ec21d2ec750ae617c666c51a4bf44098ff1 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef MATHUTILS_EULER_H
 #define MATHUTILS_EULER_H
 
-#include <Python.h>
-
 extern PyTypeObject euler_Type;
 #define EulerObject_Check(_v) PyObject_TypeCheck((_v), &euler_Type)
 
similarity index 99%
rename from source/blender/python/generic/mathutils_matrix.c
rename to source/blender/python/generic/mathutils_Matrix.c
index 1da8141eef16e88c2bfc9b2a2a2ba2195b81a7d0..87979af61b750bfc5a0bb9da03c48f95b2661096 100644 (file)
@@ -25,6 +25,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
+
 #include "mathutils.h"
 
 #include "BLI_math.h"
similarity index 99%
rename from source/blender/python/generic/mathutils_matrix.h
rename to source/blender/python/generic/mathutils_Matrix.h
index 7b9802220481f2e3ad1245145a37e8ad4a9711a4..505a7253f1a263fd7e5210a9eb4d736d70e4f37c 100644 (file)
@@ -30,8 +30,6 @@
 #ifndef MATHUTILS_MATRIX_H
 #define MATHUTILS_MATRIX_H
 
-#include <Python.h>
-
 extern PyTypeObject matrix_Type;
 #define MatrixObject_Check(_v) PyObject_TypeCheck((_v), &matrix_Type)
 #define MATRIX_MAX_DIM 4
similarity index 99%
rename from source/blender/python/generic/mathutils_quat.c
rename to source/blender/python/generic/mathutils_Quaternion.c
index e577d808091574f7ecc571dd4c5a9383fbb35279..d4affd05abf3fe59908fc276c54b82141c2e6896 100644 (file)
@@ -26,6 +26,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
+
 #include "mathutils.h"
 
 #include "BLI_math.h"
similarity index 98%
rename from source/blender/python/generic/mathutils_quat.h
rename to source/blender/python/generic/mathutils_Quaternion.h
index cfa82f20d428d437d88cefc0b6e9805124d2fbe3..6052dfa1a415d9b551d955e445dc758c4f92399d 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef MATHUTILS_QUAT_H
 #define MATHUTILS_QUAT_H
 
-#include <Python.h>
-
 extern PyTypeObject quaternion_Type;
 #define QuaternionObject_Check(_v) PyObject_TypeCheck((_v), &quaternion_Type)
 
similarity index 99%
rename from source/blender/python/generic/mathutils_vector.c
rename to source/blender/python/generic/mathutils_Vector.c
index 0da5fe983adb28b1ae41ec38635053b4cef78fab..0efd805697faf423cd0ca7ad621e9f1fbb21de37 100644 (file)
@@ -25,6 +25,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
+
 #include "mathutils.h"
 
 #include "BLI_blenlib.h"
similarity index 98%
rename from source/blender/python/generic/mathutils_vector.h
rename to source/blender/python/generic/mathutils_Vector.h
index 2dbe9d9d3fe9cf6fb889803f90f125125d1b0b6d..4013a392ff99f147efe02a1c111665afa5431e1f 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef MATHUTILS_VECTOR_H
 #define MATHUTILS_VECTOR_H
 
-#include <Python.h>
-
 extern PyTypeObject vector_Type;
 #define VectorObject_Check(_v) PyObject_TypeCheck((_v), &vector_Type)
 
index d1e9a2452f32bd98bcffdd4db365a6a026b1319d..62867eb46c1b10bcad433b83d807731ee6e98ad3 100644 (file)
@@ -27,6 +27,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
+
 #include "mathutils_geometry.h"
 
 /* Used for PolyFill */
index 27c24848efe3c8ab6845ff0437c69c8208be8609..1af25c7a751cbdc50a9c6483753c42fdf3e27490 100644 (file)
@@ -31,7 +31,6 @@
 #ifndef MATHUTILS_GEOMETRY_H
 #define MATHUTILS_GEOMETRY_H
 
-#include <Python.h>
 #include "mathutils.h"
 
 PyMODINIT_FUNC BPyInit_mathutils_geometry(void);
similarity index 99%
rename from source/blender/python/generic/noise.c
rename to source/blender/python/generic/noise_py_api.c
index 36147493dc554733cb47773594111b25bc3ac2dd..73818971564e344be35fb4596111b31fa98387b7 100644 (file)
@@ -35,6 +35,7 @@
 /************************/
 
 #include <Python.h>
+
 #include "structseq.h"
 
 #include "BLI_blenlib.h"
@@ -42,6 +43,7 @@
 
 #include "DNA_texture_types.h"
 
+#include "noise_py_api.h"
 
 /*-----------------------------------------*/
 /* 'mersenne twister' random number generator */
diff --git a/source/blender/python/generic/noise_py_api.h b/source/blender/python/generic/noise_py_api.h
new file mode 100644 (file)
index 0000000..d1fe8cc
--- /dev/null
@@ -0,0 +1,29 @@
+/**
+ * $Id:
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef NOISE_PY_API_H
+#define NOISE_PY_API_H
+
+PyObject *BPyInit_noise(void);
+
+#endif // NOISE_PY_API_H
index 9f7a9f2cabe184b435f5e0aab1b5736296e59e47..dedd6c1bcf48b4bde13f6f3659bce13aa87fec50 100644 (file)
@@ -21,6 +21,7 @@
 */
 
 #include <Python.h>
+
 #include "py_capi_utils.h"
 
 /* for debugging */
index 3c7804ab7e3b80c75a6e92687192bcd97fc45a00..5d1a086bc7579c6dc32846c7565f68884cd93498 100644 (file)
@@ -52,6 +52,7 @@ set(SRC
 
        bpy.h
        bpy_app.h
+       bpy_driver.h
        bpy_operator.h
        bpy_operator_wrap.h
        bpy_props.h
index 15b705fd374e263de28b700f1cd25831dd146f8c..51e30d75e560d9dd34816aa605f6aa3b51cf100d 100644 (file)
@@ -27,6 +27,8 @@
  
 #define WITH_PYTHON /* for AUD_PyInit.h, possibly others */
 
+#include <Python.h>
+
 #include "bpy.h" 
 #include "bpy_util.h" 
 #include "bpy_rna.h"
index 422563776f4372cdcf4e9077bca32e7f996bd367..bc7e981df983dd4291f4aa77cc0f676f5b3c082a 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
+
 #include "bpy_app.h"
+#include "bpy_driver.h"
 
 #include "BLI_path_util.h"
 #include "BLI_utildefines.h"
index 02cadc66f48405d4fe36d060f361df6a60b08282..cb71880ee7eae45ae314dc336901bf150d880e68 100644 (file)
  *
  * ***** END GPL LICENSE BLOCK *****
  */
-#ifndef BPY_APP_H__
-#define BPY_APP_H__
-
-#include <Python.h>
+#ifndef BPY_APP_H
+#define BPY_APP_H
 
 PyObject *BPY_app_struct( void );
 
-/* bpy_driver.c */
-int bpy_pydriver_create_dict(void);
-extern PyObject *bpy_pydriver_Dict;
-
-#endif
+#endif // BPY_APP_H
diff --git a/source/blender/python/intern/bpy_driver.h b/source/blender/python/intern/bpy_driver.h
new file mode 100644 (file)
index 0000000..b9aa1b5
--- /dev/null
@@ -0,0 +1,30 @@
+/**
+ * $Id: bpy_app.h 33348 2010-11-27 02:39:51Z campbellbarton $
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef BPY_DRIVER_H
+#define BPY_DRIVER_H
+
+int bpy_pydriver_create_dict(void);
+extern PyObject *bpy_pydriver_Dict;
+
+#endif // BPY_DRIVER_H
index cf47e40c2ed66add67ce3e9b30dcdb13e8aaddfa..0e9532aa726b51599a108bc0aa96633815fe4d1e 100644 (file)
 #include "../generic/bpy_internal_import.h" // our own imports
 #include "../generic/py_capi_utils.h"
 
+/* inittab initialization functions */
+#include "../generic/noise_py_api.h"
+#include "../generic/mathutils.h"
+#include "../generic/bgl.h"
+#include "../generic/blf_py_api.h"
+
 /* for internal use, when starting and ending python scripts */
 
 /* incase a python script triggers another python call, stop bpy_context_clear from invalidating */
@@ -197,12 +203,7 @@ void BPY_context_set(bContext *C)
        BPy_SetContext(C);
 }
 
-/* init-tab */
-extern PyObject *BPyInit_noise(void);
-extern PyObject *BPyInit_mathutils(void);
-// extern PyObject *BPyInit_mathutils_geometry(void); // BPyInit_mathutils calls, py doesnt work with thos :S
-extern PyObject *BPyInit_bgl(void);
-extern PyObject *BPyInit_blf(void);
+/* defined in AUD_C-API.cpp */
 extern PyObject *AUD_initPython(void);
 
 static struct _inittab bpy_internal_modules[]= {
index 70aa46c1302a2c536184a283c1b9115e963b1bf9..bdf4027e509b901d59e659921bd23bb7544720e8 100644 (file)
  */
 
 /* Note, this module is not to be used directly by the user.
- * its accessed from blender with bpy.__ops__
+ * Internally its exposed as '_bpy.ops', which provides functions for 'bpy.ops', a python package.
  * */
 
+#include <Python.h>
+
 #include "bpy_operator.h"
 #include "bpy_operator_wrap.h"
 #include "bpy_rna.h" /* for setting arg props only - pyrna_py_to_prop() */
@@ -41,6 +43,7 @@
 
 #include "MEM_guardedalloc.h"
 #include "BKE_report.h"
+#include "BKE_context.h"
 
 static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
 {
@@ -255,7 +258,7 @@ static PyObject *pyop_as_string(PyObject *UNUSED(self), PyObject *args)
        char *buf = NULL;
        PyObject *pybuf;
 
-       bContext *C = (bContext *)BPy_GetContext();
+       bContext *C= (bContext *)BPy_GetContext();
 
        if(C==NULL) {
                PyErr_SetString(PyExc_SystemError, "Context is None, cant get the string representation of this object.");
index 1a73b3eee554f97175039a16dd1ccada54a0fe9d..f45f91dbe1f211cab3bff06133173be0e5db034c 100644 (file)
 #ifndef BPY_OPERATOR_H
 #define BPY_OPERATOR_H
 
-#include <Python.h>
-
-#include "RNA_access.h"
-#include "RNA_types.h"
-#include "DNA_windowmanager_types.h"
-#include "BKE_context.h"
-
 extern PyTypeObject pyop_base_Type;
 
 #define BPy_OperatorBase_Check(v)      (PyObject_TypeCheck(v, &pyop_base_Type))
index 12c67f9e03f15b8770bd96ba4b9e463a1a574e0a..51ab889e321602fda68eae987a2211629387784e 100644 (file)
@@ -23,6 +23,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
+
 #include "bpy_operator_wrap.h"
 #include "WM_api.h"
 #include "WM_types.h"
index b61fd1323f1049ff1ffef55b8659cdf4091b33a5..1aae06c302a791720427c4f2dc2c1f9852c8aa59 100644 (file)
@@ -25,8 +25,6 @@
 #ifndef BPY_OPERATOR_WRAP_H
 #define BPY_OPERATOR_WRAP_H
 
-#include <Python.h>
-
 /* these are used for operator methods, used by bpy_operator.c */
 PyObject *PYOP_wrap_macro_define(PyObject *self, PyObject *args);
 #endif
index 7ed5db6e6dc43627939b6ce08091a2d5f0959313..e685be2238fc8ea86df4ad198c5685ad04296f4a 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
+
 #include "bpy_props.h"
 #include "bpy_rna.h"
 #include "bpy_util.h"
 
 #include "BLI_utildefines.h"
 
-
-
 #include "RNA_define.h" /* for defining our own rna */
 #include "RNA_enum_types.h"
 
index fc295ccdf5de390f57abd2e5147f9a0858bb21b2..136dd2b5b2f8315d49ce8db960aa24d464ed3e3f 100644 (file)
@@ -25,8 +25,6 @@
 #ifndef BPY_PROPS_H
 #define BPY_PROPS_H
 
-#include <Python.h>
-
 PyObject *BPY_rna_props( void );
 
 #define PYRNA_STACK_ARRAY 32
index f3626c5f6b75583d329f3d49c807702cb1fc0642..184e20a9a4bfb90e871b60aafadd1975b5ee04be 100644 (file)
@@ -21,6 +21,9 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
+
+#include <Python.h>
+
 #include <float.h> /* FLT_MIN/MAX */
 
 #include "bpy_rna.h"
index bbcc85581b263cf4e87cb6f5c2b14be4709db23d..c599ab5c95e6461e7705d2fb686ff749b6f38d1c 100644 (file)
@@ -24,8 +24,6 @@
 #ifndef BPY_RNA_H
 #define BPY_RNA_H
 
-#include <Python.h>
-
 #include "RNA_access.h"
 #include "RNA_types.h"
 #include "BKE_idprop.h"
index 32efa3871969b3194310f1b89f81646e7a436846..b4eef666279699d4b681de7ac8db7c441a607a07 100644 (file)
@@ -21,6 +21,7 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
+#include <Python.h>
 
 #include "bpy_rna.h"
 #include "BKE_global.h"
index 28b540ba418a27a3ee89b15bb6eb2e0be14e16e9..0ff67430520a8fcfe42e90052d222fbf8ce37218 100644 (file)
@@ -22,6 +22,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
 
 #include "bpy_rna.h"
 #include "bpy_rna_callback.h"
index 8ea5e64648218a5c8f920862b39b73f621842c52..0e030170a25a4ec801364a37dd18e912500d98d5 100644 (file)
@@ -22,6 +22,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <Python.h>
+
 #include "bpy_util.h"
 #include "BLI_dynstr.h"
 #include "MEM_guardedalloc.h"
index e89c8212e1b3fa161e0ec557b75c1d7da7f3ab6a..e1473a563a643985d87f9befef8c43b42e4fb2a2 100644 (file)
@@ -22,8 +22,6 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include <Python.h>
-
 #ifndef BPY_UTIL_H
 #define BPY_UTIL_H