Fix for recent kdtree py module with MSVC
also remove submodule includes from mathutils.h
This commit is contained in:
@@ -474,6 +474,12 @@ static struct PyModuleDef M_Mathutils_module_def = {
|
||||
NULL, /* m_free */
|
||||
};
|
||||
|
||||
|
||||
/* submodules only */
|
||||
#include "mathutils_geometry.h"
|
||||
#include "mathutils_kdtree.h"
|
||||
#include "mathutils_noise.h"
|
||||
|
||||
PyMODINIT_FUNC PyInit_mathutils(void)
|
||||
{
|
||||
PyObject *mod;
|
||||
|
@@ -55,10 +55,10 @@ typedef struct {
|
||||
#include "mathutils_Euler.h"
|
||||
#include "mathutils_Color.h"
|
||||
|
||||
/* utility submodules */
|
||||
#include "mathutils_geometry.h"
|
||||
#include "mathutils_noise.h"
|
||||
#include "mathutils_kdtree.h"
|
||||
// /* utility submodules */
|
||||
//
|
||||
//
|
||||
//#include "mathutils_kdtree.h"
|
||||
|
||||
PyObject *BaseMathObject_owner_get(BaseMathObject *self, void *);
|
||||
PyObject *BaseMathObject_is_wrapped_get(BaseMathObject *self, void *);
|
||||
|
@@ -27,6 +27,7 @@
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include "mathutils.h"
|
||||
#include "mathutils_geometry.h"
|
||||
|
||||
/* Used for PolyFill */
|
||||
|
@@ -27,8 +27,6 @@
|
||||
* \ingroup pymathutils
|
||||
*/
|
||||
|
||||
#include "mathutils.h"
|
||||
|
||||
PyMODINIT_FUNC PyInit_mathutils_geometry(void);
|
||||
|
||||
#endif /* __MATHUTILS_GEOMETRY_H__ */
|
||||
|
@@ -35,7 +35,9 @@
|
||||
#include "BLI_kdtree.h"
|
||||
|
||||
#include "../generic/py_capi_utils.h"
|
||||
|
||||
#include "mathutils.h"
|
||||
#include "mathutils_kdtree.h" /* own include */
|
||||
|
||||
#include "BLI_strict_flags.h"
|
||||
|
||||
|
@@ -26,7 +26,7 @@
|
||||
#ifndef __MATHUTILS_KDTREE_H__
|
||||
#define __MATHUTILS_KDTREE_H__
|
||||
|
||||
PyObject *PyInit_mathutils_kdtree(void);
|
||||
PyMODINIT_FUNC PyInit_mathutils_kdtree(void);
|
||||
|
||||
extern PyTypeObject PyKDTree_Type;
|
||||
|
||||
|
@@ -27,8 +27,6 @@
|
||||
#ifndef __MATHUTILS_NOISE_H__
|
||||
#define __MATHUTILS_NOISE_H__
|
||||
|
||||
#include "mathutils.h"
|
||||
|
||||
PyMODINIT_FUNC PyInit_mathutils_noise(void);
|
||||
PyMODINIT_FUNC PyInit_mathutils_noise_types(void);
|
||||
PyMODINIT_FUNC PyInit_mathutils_noise_metrics(void);
|
||||
|
Reference in New Issue
Block a user