blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 2). 

(See commit e1771e72fbbf828dbf5bed871b814288389f3611 for more detail of
the problem).

Fixed for #include <Python.h> not properly put in the extern "C" { ... } construct.

Also removed redundant inclusion of the header file in the Freestyle Python API code.
This commit is contained in:
Tamito Kajiyama 2014-04-17 12:25:41 +09:00
parent 5db8da8105
commit 5d4a6a94ef
157 changed files with 83 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/freestyle/intern/python/BPy_BBox.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_BBOX_H__
#define __FREESTYLE_PYTHON_BBOX_H__
extern "C" {
#include <Python.h>
}
#include "../geometry/BBox.h"
#include "../geometry/Geom.h"

2
source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__
#define __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__
extern "C" {
#include <Python.h>
}
#include "../stroke/Predicates0D.h"

2
source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__
#define __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__
extern "C" {
#include <Python.h>
}
#include "../stroke/Predicates1D.h"

2
source/blender/freestyle/intern/python/BPy_ContextFunctions.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__
#define __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__
extern "C" {
#include <Python.h>
}
#ifdef __cplusplus
extern "C" {

3
source/blender/freestyle/intern/python/BPy_Convert.h
View File

@ -25,7 +25,10 @@
#ifndef __FREESTYLE_PYTHON_CONVERT_H__
#define __FREESTYLE_PYTHON_CONVERT_H__
extern "C" {
#include <Python.h>
}
#include <typeinfo>
#include "../geometry/Geom.h"

4
source/blender/freestyle/intern/python/BPy_Freestyle.h
View File

@ -25,12 +25,12 @@
#ifndef __FREESTYLE_PYTHON_FREESTYLE_H__
#define __FREESTYLE_PYTHON_FREESTYLE_H__
#include <Python.h>
#ifdef __cplusplus
extern "C" {
#endif
#include <Python.h>
///////////////////////////////////////////////////////////////////////////////////////////
/*---------------------------Python BPy_Freestyle visible prototypes-----------*/

2
source/blender/freestyle/intern/python/BPy_FrsMaterial.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_FRSMATERIAL_H__
#define __FREESTYLE_PYTHON_FRSMATERIAL_H__
extern "C" {
#include <Python.h>
}
#include "../scene_graph/FrsMaterial.h"

2
source/blender/freestyle/intern/python/BPy_FrsNoise.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_FRSNOISE_H__
#define __FREESTYLE_PYTHON_FRSNOISE_H__
extern "C" {
#include <Python.h>
}
#include "../geometry/Noise.h"

3
source/blender/freestyle/intern/python/BPy_Id.h
View File

@ -25,7 +25,10 @@
#ifndef __FREESTYLE_PYTHON_ID_H__
#define __FREESTYLE_PYTHON_ID_H__
extern "C" {
#include <Python.h>
}
#include <iostream>
using namespace std;

2
source/blender/freestyle/intern/python/BPy_IntegrationType.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_INTEGRATIONTYPE_H__
#define __FREESTYLE_PYTHON_INTEGRATIONTYPE_H__
extern "C" {
#include <Python.h>
}
#include "../view_map/Interface1D.h"

2
source/blender/freestyle/intern/python/BPy_Interface0D.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_INTERFACE0D_H__
#define __FREESTYLE_PYTHON_INTERFACE0D_H__
extern "C" {
#include <Python.h>
}
#include "../view_map/Interface0D.h"

2
source/blender/freestyle/intern/python/BPy_Interface1D.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_INTERFACE1D_H__
#define __FREESTYLE_PYTHON_INTERFACE1D_H__
extern "C" {
#include <Python.h>
}
#include "../view_map/Interface1D.h"

2
source/blender/freestyle/intern/python/BPy_Iterator.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_ITERATOR_H__
#define __FREESTYLE_PYTHON_ITERATOR_H__
extern "C" {
#include <Python.h>
}
#include "../system/Iterator.h"

2
source/blender/freestyle/intern/python/BPy_MediumType.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_MEDIUMTYPE_H__
#define __FREESTYLE_PYTHON_MEDIUMTYPE_H__
extern "C" {
#include <Python.h>
}
#include "../stroke/Stroke.h"

2
source/blender/freestyle/intern/python/BPy_Nature.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_NATURE_H__
#define __FREESTYLE_PYTHON_NATURE_H__
extern "C" {
#include <Python.h>
}
#include "../winged_edge/Nature.h"

2
source/blender/freestyle/intern/python/BPy_Operators.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_OPERATORS_H__
#define __FREESTYLE_PYTHON_OPERATORS_H__
extern "C" {
#include <Python.h>
}
#include "../stroke/Operators.h"

2
source/blender/freestyle/intern/python/BPy_SShape.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_SSHAPE_H__
#define __FREESTYLE_PYTHON_SSHAPE_H__
extern "C" {
#include <Python.h>
}
#include "../view_map/Silhouette.h"

2
source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_STROKEATTRIBUTE_H__
#define __FREESTYLE_PYTHON_STROKEATTRIBUTE_H__
extern "C" {
#include <Python.h>
}
#include "../stroke/Stroke.h"

2
source/blender/freestyle/intern/python/BPy_StrokeShader.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_STROKESHADER_H__
#define __FREESTYLE_PYTHON_STROKESHADER_H__
extern "C" {
#include <Python.h>
}
#include "../system/FreestyleConfig.h"

2
source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__
#define __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__
extern "C" {
#include <Python.h>
}
#include "../view_map/Functions0D.h"

2
source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__
#define __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__
extern "C" {
#include <Python.h>
}
#include "../view_map/Functions1D.h"

2
source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_UNARYPREDICATE0D_H__
#define __FREESTYLE_PYTHON_UNARYPREDICATE0D_H__
extern "C" {
#include <Python.h>
}
#include "../stroke/Predicates0D.h"

2
source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_UNARYPREDICATE1D_H__
#define __FREESTYLE_PYTHON_UNARYPREDICATE1D_H__
extern "C" {
#include <Python.h>
}
#include "../stroke/Predicates1D.h"

2
source/blender/freestyle/intern/python/BPy_ViewMap.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_VIEWMAP_H__
#define __FREESTYLE_PYTHON_VIEWMAP_H__
extern "C" {
#include <Python.h>
}
#include "../view_map/ViewMap.h"

2
source/blender/freestyle/intern/python/BPy_ViewShape.h
View File

@ -25,7 +25,9 @@
#ifndef __FREESTYLE_PYTHON_VIEWSHAPE_H__
#define __FREESTYLE_PYTHON_VIEWSHAPE_H__
extern "C" {
#include <Python.h>
}
#include "../view_map/ViewMap.h"

2
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject FalseBP1D_Type;
#define BPy_FalseBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FalseBP1D_Type))

2
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject Length2DBP1D_Type;
#define BPy_Length2DBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Length2DBP1D_Type))

2
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject SameShapeIdBP1D_Type;
#define BPy_SameShapeIdBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SameShapeIdBP1D_Type))

2
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject TrueBP1D_Type;
#define BPy_TrueBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TrueBP1D_Type))

2
source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ViewMapGradientNormBP1D_Type;
#define BPy_ViewMapGradientNormBP1D_Check(v) \

3
source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
View File

@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_CURVEPOINT_H__
#include "../BPy_Interface0D.h"
#include "../../stroke/Curve.h"
#ifdef __cplusplus
@ -34,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject CurvePoint_Type;
#define BPy_CurvePoint_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CurvePoint_Type))

4
source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
View File

@ -25,9 +25,9 @@
#ifndef __FREESTYLE_PYTHON_SVERTEX_H__
#define __FREESTYLE_PYTHON_SVERTEX_H__
#include "../../view_map/Silhouette.h"
#include "../BPy_Interface0D.h"
#include "../../view_map/Silhouette.h"
#ifdef __cplusplus
extern "C" {
@ -35,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject SVertex_Type;
#define BPy_SVertex_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SVertex_Type))

5
source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
View File

@ -25,17 +25,16 @@
#ifndef __FREESTYLE_PYTHON_VIEWVERTEX_H__
#define __FREESTYLE_PYTHON_VIEWVERTEX_H__
#include "../../view_map/ViewMap.h"
#include "../BPy_Interface0D.h"
#include "../../view_map/ViewMap.h"
#ifdef __cplusplus
extern "C" {
#endif
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ViewVertex_Type;
#define BPy_ViewVertex_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewVertex_Type))

3
source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
View File

@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_STROKEVERTEX_H__
#include "../BPy_CurvePoint.h"
#include "../../../stroke/Stroke.h"
#ifdef __cplusplus
@ -34,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject StrokeVertex_Type;
#define BPy_StrokeVertex_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeVertex_Type))

3
source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
View File

@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_NONTVERTEX_H__
#include "../BPy_ViewVertex.h"
#include "../../../view_map/ViewMap.h"
#ifdef __cplusplus
@ -34,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject NonTVertex_Type;
#define BPy_NonTVertex_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&NonTVertex_Type))

3
source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
View File

@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_TVERTEX_H__
#include "../BPy_ViewVertex.h"
#include "../../../view_map/ViewMap.h"
#ifdef __cplusplus
@ -34,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject TVertex_Type;
#define BPy_TVertex_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TVertex_Type))

3
source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
View File

@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_FEDGE_H__
#include "../BPy_Interface1D.h"
#include "../../view_map/Silhouette.h"
#ifdef __cplusplus
@ -34,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject FEdge_Type;
#define BPy_FEdge_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FEdge_Type))

3
source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h
View File

@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_FRSCURVE_H__
#include "../BPy_Interface1D.h"
#include "../../stroke/Curve.h"
#ifdef __cplusplus
@ -34,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject FrsCurve_Type;
#define BPy_FrsCurve_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FrsCurve_Type))

3
source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
View File

@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_STROKE_H__
#include "../BPy_Interface1D.h"
#include "../../stroke/Stroke.h"
#ifdef __cplusplus
@ -34,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject Stroke_Type;
#define BPy_Stroke_Check(v) (((PyObject *)v)->ob_type == &Stroke_Type)

6
source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
View File

@ -25,18 +25,16 @@
#ifndef __FREESTYLE_PYTHON_VIEWEDGE_H__
#define __FREESTYLE_PYTHON_VIEWEDGE_H__
#include "../../view_map/ViewMap.h"
#include "../BPy_Interface1D.h"
#include "../../view_map/ViewMap.h"
#ifdef __cplusplus
extern "C" {
#endif
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ViewEdge_Type;
#define BPy_ViewEdge_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewEdge_Type))

3
source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
View File

@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_CHAIN_H__
#include "../BPy_FrsCurve.h"
#include "../../../stroke/Chain.h"
#ifdef __cplusplus
@ -34,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject Chain_Type;
#define BPy_Chain_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Chain_Type))

3
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
View File

@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_FEDGESHARP_H__
#include "../BPy_FEdge.h"
#include "../../../view_map/Silhouette.h"
#ifdef __cplusplus
@ -34,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject FEdgeSharp_Type;
#define BPy_FEdgeSharp_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FEdgeSharp_Type))

3
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
View File

@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_FEDGESMOOTH_H__
#include "../BPy_FEdge.h"
#include "../../../view_map/Silhouette.h"
#ifdef __cplusplus
@ -34,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject FEdgeSmooth_Type;
#define BPy_FEdgeSmooth_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FEdgeSmooth_Type))

4
source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
View File

@ -25,9 +25,9 @@
#ifndef __FREESTYLE_PYTHON_ADJACENCYITERATOR_H__
#define __FREESTYLE_PYTHON_ADJACENCYITERATOR_H__
#include "../../stroke/ChainingIterators.h"
#include "../BPy_Iterator.h"
#include "../../stroke/ChainingIterators.h"
#ifdef __cplusplus
extern "C" {
@ -35,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject AdjacencyIterator_Type;
#define BPy_AdjacencyIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&AdjacencyIterator_Type))

5
source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
View File

@ -25,19 +25,16 @@
#ifndef __FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H__
#define __FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H__
#include "BPy_ChainingIterator.h"
#include "../../stroke/ChainingIterators.h"
#include "BPy_ChainingIterator.h"
#ifdef __cplusplus
extern "C" {
#endif
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ChainPredicateIterator_Type;
#define BPy_ChainPredicateIterator_Check(v) \

5
source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
View File

@ -25,19 +25,16 @@
#ifndef __FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H__
#define __FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H__
#include "BPy_ChainingIterator.h"
#include "../../stroke/ChainingIterators.h"
#include "BPy_ChainingIterator.h"
#ifdef __cplusplus
extern "C" {
#endif
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ChainSilhouetteIterator_Type;
#define BPy_ChainSilhouetteIterator_Check(v) \

5
source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
View File

@ -25,19 +25,16 @@
#ifndef __FREESTYLE_PYTHON_CHAININGITERATOR_H__
#define __FREESTYLE_PYTHON_CHAININGITERATOR_H__
#include "BPy_ViewEdgeIterator.h"
#include "../../stroke/ChainingIterators.h"
#include "BPy_ViewEdgeIterator.h"
#ifdef __cplusplus
extern "C" {
#endif
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ChainingIterator_Type;
#define BPy_ChainingIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainingIterator_Type))

6
source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
View File

@ -25,18 +25,16 @@
#ifndef __FREESTYLE_PYTHON_CURVEPOINTITERATOR_H__
#define __FREESTYLE_PYTHON_CURVEPOINTITERATOR_H__
#include "../../stroke/CurveIterators.h"
#include "../BPy_Iterator.h"
#include "../../stroke/CurveIterators.h"
#ifdef __cplusplus
extern "C" {
#endif
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject CurvePointIterator_Type;
#define BPy_CurvePointIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CurvePointIterator_Type))

4
source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
View File

@ -25,9 +25,9 @@
#ifndef __FREESTYLE_PYTHON_INTERFACE0DITERATOR_H__
#define __FREESTYLE_PYTHON_INTERFACE0DITERATOR_H__
#include "../../view_map/Interface0D.h"
#include "../BPy_Iterator.h"
#include "../../view_map/Interface0D.h"
#ifdef __cplusplus
extern "C" {
@ -35,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject Interface0DIterator_Type;
#define BPy_Interface0DIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Interface0DIterator_Type))

5
source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
View File

@ -25,10 +25,9 @@
#ifndef __FREESTYLE_PYTHON_SVERTEXITERATOR_H__
#define __FREESTYLE_PYTHON_SVERTEXITERATOR_H__
#include "../../view_map/ViewMapIterators.h"
#include "../BPy_Iterator.h"
#include "../../view_map/ViewMapIterators.h"
#ifdef __cplusplus
extern "C" {
@ -36,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject SVertexIterator_Type;
#define BPy_SVertexIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SVertexIterator_Type))

6
source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
View File

@ -25,18 +25,16 @@
#ifndef __FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H__
#define __FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H__
#include "../../stroke/StrokeIterators.h"
#include "../BPy_Iterator.h"
#include "../../stroke/StrokeIterators.h"
#ifdef __cplusplus
extern "C" {
#endif
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject StrokeVertexIterator_Type;
#define BPy_StrokeVertexIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeVertexIterator_Type))

5
source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
View File

@ -25,19 +25,16 @@
#ifndef __FREESTYLE_PYTHON_VIEWEDGEITERATOR_H__
#define __FREESTYLE_PYTHON_VIEWEDGEITERATOR_H__
#include "../BPy_Iterator.h"
#include "../../view_map/ViewMapIterators.h"
#include "../BPy_Iterator.h"
#ifdef __cplusplus
extern "C" {
#endif
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ViewEdgeIterator_Type;
#define BPy_ViewEdgeIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewEdgeIterator_Type))

6
source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
View File

@ -26,18 +26,16 @@
#define __FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H__
#include "../../stroke/Stroke.h"
#include "../../view_map/ViewMapIterators.h"
#include "../BPy_Iterator.h"
#include "../../view_map/ViewMapIterators.h"
#ifdef __cplusplus
extern "C" {
#endif
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject orientedViewEdgeIterator_Type;
#define BPy_orientedViewEdgeIterator_Check(v) \

2
source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject BackboneStretcherShader_Type;
#define BPy_BackboneStretcherShader_Check(v) \

2
source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject BezierCurveShader_Type;
#define BPy_BezierCurveShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&BezierCurveShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject CalligraphicShader_Type;
#define BPy_CalligraphicShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CalligraphicShader_Type)

2
source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ColorNoiseShader_Type;
#define BPy_ColorNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ColorNoiseShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ColorVariationPatternShader_Type;
#define BPy_ColorVariationPatternShader_Check(v) \

2
source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ConstantColorShader_Type;
#define BPy_ConstantColorShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstantColorShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ConstantThicknessShader_Type;
#define BPy_ConstantThicknessShader_Check(v) \

2
source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ConstrainedIncreasingThicknessShader_Type;
#define BPy_ConstrainedIncreasingThicknessShader_Check(v) \

2
source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GuidingLinesShader_Type;
#define BPy_GuidingLinesShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GuidingLinesShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject IncreasingColorShader_Type;
#define BPy_IncreasingColorShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&IncreasingColorShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject IncreasingThicknessShader_Type;
#define BPy_IncreasingThicknessShader_Check(v) \

2
source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject PolygonalizationShader_Type;
#define BPy_PolygonalizationShader_Check(v) \

2
source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject SamplingShader_Type;
#define BPy_SamplingShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SamplingShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject SmoothingShader_Type;
#define BPy_SmoothingShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SmoothingShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject SpatialNoiseShader_Type;
#define BPy_SpatialNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SpatialNoiseShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject StrokeTextureShader_Type;
#define BPy_StrokeTextureShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeTextureShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject TextureAssignerShader_Type;
#define BPy_TextureAssignerShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TextureAssignerShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ThicknessNoiseShader_Type;
#define BPy_ThicknessNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ThicknessNoiseShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ThicknessVariationPatternShader_Type;
#define BPy_ThicknessVariationPatternShader_Check(v) \

2
source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject TipRemoverShader_Type;
#define BPy_TipRemoverShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TipRemoverShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject fstreamShader_Type;
#define BPy_fstreamShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&fstreamShader_Type))

2
source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject streamShader_Type;
#define BPy_streamShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&streamShader_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DDouble_Type;
#define BPy_UnaryFunction0DDouble_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DDouble_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
View File

@ -35,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DEdgeNature_Type;
#define BPy_UnaryFunction0DEdgeNature_Check(v) \

2
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DFloat_Type;
#define BPy_UnaryFunction0DFloat_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DFloat_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
View File

@ -35,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DId_Type;
#define BPy_UnaryFunction0DId_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DId_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
View File

@ -35,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DMaterial_Type;
#define BPy_UnaryFunction0DMaterial_Check(v) \

2
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DUnsigned_Type;
#define BPy_UnaryFunction0DUnsigned_Check(v) \

2
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
View File

@ -36,8 +36,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DVec2f_Type;
#define BPy_UnaryFunction0DVec2f_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DVec2f_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
View File

@ -36,8 +36,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DVec3f_Type;
#define BPy_UnaryFunction0DVec3f_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DVec3f_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
View File

@ -36,8 +36,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DVectorViewShape_Type;
#define BPy_UnaryFunction0DVectorViewShape_Check(v) \

2
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
View File

@ -35,8 +35,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject UnaryFunction0DViewShape_Type;
#define BPy_UnaryFunction0DViewShape_Check(v) \

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject ShapeIdF0D_Type;
#define BPy_ShapeIdF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ShapeIdF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject MaterialF0D_Type;
#define BPy_MaterialF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&MaterialF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject CurveNatureF0D_Type;
#define BPy_CurveNatureF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CurveNatureF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject Normal2DF0D_Type;
#define BPy_Normal2DF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Normal2DF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject VertexOrientation2DF0D_Type;
#define BPy_VertexOrientation2DF0D_Check(v) \

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject VertexOrientation3DF0D_Type;
#define BPy_VertexOrientation3DF0D_Check(v) \

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetOccludeeF0D_Type;
#define BPy_GetOccludeeF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetOccludeeF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetShapeF0D_Type;
#define BPy_GetShapeF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetShapeF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject Curvature2DAngleF0D_Type;
#define BPy_Curvature2DAngleF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Curvature2DAngleF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject DensityF0D_Type;
#define BPy_DensityF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&DensityF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetProjectedXF0D_Type;
#define BPy_GetProjectedXF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedXF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetProjectedYF0D_Type;
#define BPy_GetProjectedYF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedYF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetProjectedZF0D_Type;
#define BPy_GetProjectedZF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedZF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetXF0D_Type;
#define BPy_GetXF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetXF0D_Type))

2
source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
View File

@ -33,8 +33,6 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
#include <Python.h>
extern PyTypeObject GetYF0D_Type;
#define BPy_GetYF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetYF0D_Type))

Some files were not shown because too many files have changed in this diff Show More