blender
/
blender
134
399
Fork 583
Code Issues 6.3k Pull Requests 753 Projects 19 Wiki Activity

Cleanup: Remove using-directive from freestyle headers 

The header files in freestyle utilize the using-directive at the global
file scope. This is a bad practice as it pollutes the global name space
causing possible ambiguous reference compilation errors. In particular,
the DNA files that are included by freestyle will cause those ambiguous
reference errors when the developers adds a DNA member with a type name
that also exist in the Freestyle name space, such as Curve and possibly
others.

This patch does the minimal work needed to resolve that by moving the
using-directives from the headers into the corresponding translation
units.

Reviewed By: Brecht

Differential Revision: https://developer.blender.org/D10351
This commit is contained in:
Omar Emara 2021-02-08 17:28:15 +02:00
parent 048135e2c8
commit 21a2b975b8
216 changed files with 442 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/freestyle/intern/python/BPy_BBox.cpp
View File

@ -24,6 +24,9 @@
extern "C" {
#endif
using namespace Freestyle;
using namespace Freestyle::Geometry;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -27,9 +27,6 @@ extern "C" {
#include "../geometry/BBox.h"
#include "../geometry/Geom.h"
using namespace Freestyle;
using namespace Freestyle::Geometry;
#ifdef __cplusplus
extern "C" {
#endif
@ -42,7 +39,7 @@ extern PyTypeObject BBox_Type;
/*---------------------------Python BPy_BBox structure definition----------*/
typedef struct {
PyObject_HEAD BBox<Vec3r> *bb;
PyObject_HEAD Freestyle::BBox<Freestyle::Geometry::Vec3r> *bb;
} BPy_BBox;
/*---------------------------Python BPy_BBox visible prototypes-----------*/

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

@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../stroke/Predicates0D.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -41,7 +39,7 @@ extern PyTypeObject BinaryPredicate0D_Type;
/*---------------------------Python BPy_BinaryPredicate0D structure definition----------*/
typedef struct {
PyObject_HEAD BinaryPredicate0D *bp0D;
PyObject_HEAD Freestyle::BinaryPredicate0D *bp0D;
} BPy_BinaryPredicate0D;
/*---------------------------Python BPy_BinaryPredicate0D visible prototypes-----------*/

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

@ -33,6 +33,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../stroke/Predicates1D.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -41,7 +39,7 @@ extern PyTypeObject BinaryPredicate1D_Type;
/*---------------------------Python BPy_BinaryPredicate1D structure definition----------*/
typedef struct {
PyObject_HEAD BinaryPredicate1D *bp1D;
PyObject_HEAD Freestyle::BinaryPredicate1D *bp1D;
} BPy_BinaryPredicate1D;
/*---------------------------Python BPy_BinaryPredicate1D visible prototypes-----------*/

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

@ -61,6 +61,9 @@
extern "C" {
#endif
using namespace Freestyle;
using namespace Freestyle::Geometry;
///////////////////////////////////////////////////////////////////////////////////////////
//==============================

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

@ -28,9 +28,6 @@ extern "C" {
#include "../geometry/Geom.h"
using namespace Freestyle;
using namespace Freestyle::Geometry;
// BBox
#include "../geometry/BBox.h"
@ -94,76 +91,81 @@ extern "C" {
//==============================
PyObject *PyBool_from_bool(bool b);
PyObject *Vector_from_Vec2f(Vec2f &v);
PyObject *Vector_from_Vec3f(Vec3f &v);
PyObject *Vector_from_Vec3r(Vec3r &v);
PyObject *Vector_from_Vec2f(Freestyle::Geometry::Vec2f &v);
PyObject *Vector_from_Vec3f(Freestyle::Geometry::Vec3f &v);
PyObject *Vector_from_Vec3r(Freestyle::Geometry::Vec3r &v);
PyObject *Any_BPy_Interface0D_from_Interface0D(Interface0D &if0D);
PyObject *Any_BPy_Interface1D_from_Interface1D(Interface1D &if1D);
PyObject *Any_BPy_FEdge_from_FEdge(FEdge &fe);
PyObject *Any_BPy_ViewVertex_from_ViewVertex(ViewVertex &vv);
PyObject *Any_BPy_Interface0D_from_Interface0D(Freestyle::Interface0D &if0D);
PyObject *Any_BPy_Interface1D_from_Interface1D(Freestyle::Interface1D &if1D);
PyObject *Any_BPy_FEdge_from_FEdge(Freestyle::FEdge &fe);
PyObject *Any_BPy_ViewVertex_from_ViewVertex(Freestyle::ViewVertex &vv);
PyObject *BPy_BBox_from_BBox(const BBox<Vec3r> &bb);
PyObject *BPy_CurvePoint_from_CurvePoint(CurvePoint &cp);
PyObject *BPy_directedViewEdge_from_directedViewEdge(ViewVertex::directedViewEdge &dve);
PyObject *BPy_FEdge_from_FEdge(FEdge &fe);
PyObject *BPy_FEdgeSharp_from_FEdgeSharp(FEdgeSharp &fes);
PyObject *BPy_FEdgeSmooth_from_FEdgeSmooth(FEdgeSmooth &fes);
PyObject *BPy_Id_from_Id(Id &id);
PyObject *BPy_Interface0D_from_Interface0D(Interface0D &if0D);
PyObject *BPy_Interface1D_from_Interface1D(Interface1D &if1D);
PyObject *BPy_IntegrationType_from_IntegrationType(IntegrationType i);
PyObject *BPy_FrsMaterial_from_FrsMaterial(const FrsMaterial &m);
PyObject *BPy_BBox_from_BBox(const Freestyle::BBox<Freestyle::Geometry::Vec3r> &bb);
PyObject *BPy_CurvePoint_from_CurvePoint(Freestyle::CurvePoint &cp);
PyObject *BPy_directedViewEdge_from_directedViewEdge(Freestyle::ViewVertex::directedViewEdge &dve);
PyObject *BPy_FEdge_from_FEdge(Freestyle::FEdge &fe);
PyObject *BPy_FEdgeSharp_from_FEdgeSharp(Freestyle::FEdgeSharp &fes);
PyObject *BPy_FEdgeSmooth_from_FEdgeSmooth(Freestyle::FEdgeSmooth &fes);
PyObject *BPy_Id_from_Id(Freestyle::Id &id);
PyObject *BPy_Interface0D_from_Interface0D(Freestyle::Interface0D &if0D);
PyObject *BPy_Interface1D_from_Interface1D(Freestyle::Interface1D &if1D);
PyObject *BPy_IntegrationType_from_IntegrationType(Freestyle::IntegrationType i);
PyObject *BPy_FrsMaterial_from_FrsMaterial(const Freestyle::FrsMaterial &m);
PyObject *BPy_Nature_from_Nature(unsigned short n);
PyObject *BPy_MediumType_from_MediumType(Stroke::MediumType n);
PyObject *BPy_SShape_from_SShape(SShape &ss);
PyObject *BPy_Stroke_from_Stroke(Stroke &s);
PyObject *BPy_StrokeAttribute_from_StrokeAttribute(StrokeAttribute &sa);
PyObject *BPy_StrokeVertex_from_StrokeVertex(StrokeVertex &sv);
PyObject *BPy_SVertex_from_SVertex(SVertex &sv);
PyObject *BPy_ViewVertex_from_ViewVertex(ViewVertex &vv);
PyObject *BPy_NonTVertex_from_NonTVertex(NonTVertex &ntv);
PyObject *BPy_TVertex_from_TVertex(TVertex &tv);
PyObject *BPy_ViewEdge_from_ViewEdge(ViewEdge &ve);
PyObject *BPy_Chain_from_Chain(Chain &c);
PyObject *BPy_ViewShape_from_ViewShape(ViewShape &vs);
PyObject *BPy_MediumType_from_MediumType(Freestyle::Stroke::MediumType n);
PyObject *BPy_SShape_from_SShape(Freestyle::SShape &ss);
PyObject *BPy_Stroke_from_Stroke(Freestyle::Stroke &s);
PyObject *BPy_StrokeAttribute_from_StrokeAttribute(Freestyle::StrokeAttribute &sa);
PyObject *BPy_StrokeVertex_from_StrokeVertex(Freestyle::StrokeVertex &sv);
PyObject *BPy_SVertex_from_SVertex(Freestyle::SVertex &sv);
PyObject *BPy_ViewVertex_from_ViewVertex(Freestyle::ViewVertex &vv);
PyObject *BPy_NonTVertex_from_NonTVertex(Freestyle::NonTVertex &ntv);
PyObject *BPy_TVertex_from_TVertex(Freestyle::TVertex &tv);
PyObject *BPy_ViewEdge_from_ViewEdge(Freestyle::ViewEdge &ve);
PyObject *BPy_Chain_from_Chain(Freestyle::Chain &c);
PyObject *BPy_ViewShape_from_ViewShape(Freestyle::ViewShape &vs);
PyObject *BPy_AdjacencyIterator_from_AdjacencyIterator(AdjacencyIterator &a_it);
PyObject *BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator &if0D_it,
PyObject *BPy_AdjacencyIterator_from_AdjacencyIterator(Freestyle::AdjacencyIterator &a_it);
PyObject *BPy_Interface0DIterator_from_Interface0DIterator(Freestyle::Interface0DIterator &if0D_it,
bool reversed);
PyObject *BPy_CurvePointIterator_from_CurvePointIterator(CurveInternal::CurvePointIterator &cp_it);
PyObject *BPy_CurvePointIterator_from_CurvePointIterator(
Freestyle::CurveInternal::CurvePointIterator &cp_it);
PyObject *BPy_StrokeVertexIterator_from_StrokeVertexIterator(
StrokeInternal::StrokeVertexIterator &sv_it, bool reversed);
PyObject *BPy_SVertexIterator_from_SVertexIterator(ViewEdgeInternal::SVertexIterator &sv_it);
Freestyle::StrokeInternal::StrokeVertexIterator &sv_it, bool reversed);
PyObject *BPy_SVertexIterator_from_SVertexIterator(
Freestyle::ViewEdgeInternal::SVertexIterator &sv_it);
PyObject *BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(
ViewVertexInternal::orientedViewEdgeIterator &ove_it, bool reversed);
PyObject *BPy_ViewEdgeIterator_from_ViewEdgeIterator(ViewEdgeInternal::ViewEdgeIterator &ve_it);
PyObject *BPy_ChainingIterator_from_ChainingIterator(ChainingIterator &c_it);
PyObject *BPy_ChainPredicateIterator_from_ChainPredicateIterator(ChainPredicateIterator &cp_it);
PyObject *BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator(ChainSilhouetteIterator &cs_it);
Freestyle::ViewVertexInternal::orientedViewEdgeIterator &ove_it, bool reversed);
PyObject *BPy_ViewEdgeIterator_from_ViewEdgeIterator(
Freestyle::ViewEdgeInternal::ViewEdgeIterator &ve_it);
PyObject *BPy_ChainingIterator_from_ChainingIterator(Freestyle::ChainingIterator &c_it);
PyObject *BPy_ChainPredicateIterator_from_ChainPredicateIterator(
Freestyle::ChainPredicateIterator &cp_it);
PyObject *BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator(
Freestyle::ChainSilhouetteIterator &cs_it);
//==============================
// Python => C++
//==============================
bool bool_from_PyBool(PyObject *b);
IntegrationType IntegrationType_from_BPy_IntegrationType(PyObject *obj);
Stroke::MediumType MediumType_from_BPy_MediumType(PyObject *obj);
Nature::EdgeNature EdgeNature_from_BPy_Nature(PyObject *obj);
bool Vec2f_ptr_from_PyObject(PyObject *obj, Vec2f &vec);
bool Vec3f_ptr_from_PyObject(PyObject *obj, Vec3f &vec);
bool Vec3r_ptr_from_PyObject(PyObject *obj, Vec3r &vec);
bool Vec2f_ptr_from_Vector(PyObject *obj, Vec2f &vec);
bool Vec3f_ptr_from_Vector(PyObject *obj, Vec3f &vec);
bool Vec3r_ptr_from_Vector(PyObject *obj, Vec3r &vec);
bool Vec3f_ptr_from_Color(PyObject *obj, Vec3f &vec);
bool Vec3r_ptr_from_Color(PyObject *obj, Vec3r &vec);
bool Vec2f_ptr_from_PyList(PyObject *obj, Vec2f &vec);
bool Vec3f_ptr_from_PyList(PyObject *obj, Vec3f &vec);
bool Vec3r_ptr_from_PyList(PyObject *obj, Vec3r &vec);
bool Vec2f_ptr_from_PyTuple(PyObject *obj, Vec2f &vec);
bool Vec3f_ptr_from_PyTuple(PyObject *obj, Vec3f &vec);
bool Vec3r_ptr_from_PyTuple(PyObject *obj, Vec3r &vec);
Freestyle::IntegrationType IntegrationType_from_BPy_IntegrationType(PyObject *obj);
Freestyle::Stroke::MediumType MediumType_from_BPy_MediumType(PyObject *obj);
Freestyle::Nature::EdgeNature EdgeNature_from_BPy_Nature(PyObject *obj);
bool Vec2f_ptr_from_PyObject(PyObject *obj, Freestyle::Geometry::Vec2f &vec);
bool Vec3f_ptr_from_PyObject(PyObject *obj, Freestyle::Geometry::Vec3f &vec);
bool Vec3r_ptr_from_PyObject(PyObject *obj, Freestyle::Geometry::Vec3r &vec);
bool Vec2f_ptr_from_Vector(PyObject *obj, Freestyle::Geometry::Vec2f &vec);
bool Vec3f_ptr_from_Vector(PyObject *obj, Freestyle::Geometry::Vec3f &vec);
bool Vec3r_ptr_from_Vector(PyObject *obj, Freestyle::Geometry::Vec3r &vec);
bool Vec3f_ptr_from_Color(PyObject *obj, Freestyle::Geometry::Vec3f &vec);
bool Vec3r_ptr_from_Color(PyObject *obj, Freestyle::Geometry::Vec3r &vec);
bool Vec2f_ptr_from_PyList(PyObject *obj, Freestyle::Geometry::Vec2f &vec);
bool Vec3f_ptr_from_PyList(PyObject *obj, Freestyle::Geometry::Vec3f &vec);
bool Vec3r_ptr_from_PyList(PyObject *obj, Freestyle::Geometry::Vec3r &vec);
bool Vec2f_ptr_from_PyTuple(PyObject *obj, Freestyle::Geometry::Vec2f &vec);
bool Vec3f_ptr_from_PyTuple(PyObject *obj, Freestyle::Geometry::Vec3f &vec);
bool Vec3r_ptr_from_PyTuple(PyObject *obj, Freestyle::Geometry::Vec3r &vec);
bool float_array_from_PyObject(PyObject *obj, float *v, int n);

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

@ -28,6 +28,8 @@ extern "C" {
#include "BLI_hash_mm2a.h"
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../scene_graph/FrsMaterial.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -41,7 +39,7 @@ extern PyTypeObject FrsMaterial_Type;
/*---------------------------Python BPy_FrsMaterial structure definition----------*/
typedef struct {
PyObject_HEAD FrsMaterial *m;
PyObject_HEAD Freestyle::FrsMaterial *m;
} BPy_FrsMaterial;
/*---------------------------Python BPy_FrsMaterial visible prototypes-----------*/

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

@ -29,6 +29,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -27,8 +27,6 @@ extern "C" {
#include "../geometry/Noise.h"
#include "../system/PseudoNoise.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -41,8 +39,8 @@ extern PyTypeObject FrsNoise_Type;
/*---------------------------Python BPy_FrsNoise structure definition----------*/
typedef struct {
PyObject_HEAD Noise *n;
PseudoNoise *pn;
PyObject_HEAD Freestyle::Noise *n;
Freestyle::PseudoNoise *pn;
} BPy_FrsNoise;
/*---------------------------Python BPy_FrsNoise visible prototypes-----------*/

2
source/blender/freestyle/intern/python/BPy_Id.cpp
View File

@ -26,6 +26,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,12 +26,8 @@ extern "C" {
#include <iostream>
using namespace std;
#include "../system/Id.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -44,7 +40,7 @@ extern PyTypeObject Id_Type;
/*---------------------------Python BPy_Id structure definition----------*/
typedef struct {
PyObject_HEAD Id *id;
PyObject_HEAD Freestyle::Id *id;
} BPy_Id;
/*---------------------------Python BPy_Id visible prototypes-----------*/

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

@ -30,6 +30,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------ MODULE FUNCTIONS ----------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../view_map/Interface1D.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif

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

@ -34,6 +34,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../view_map/Interface0D.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -41,7 +39,7 @@ extern PyTypeObject Interface0D_Type;
/*---------------------------Python BPy_Interface0D structure definition----------*/
typedef struct {
PyObject_HEAD Interface0D *if0D;
PyObject_HEAD Freestyle::Interface0D *if0D;
bool borrowed; /* true if *if0D is a borrowed object */
} BPy_Interface0D;

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

@ -35,6 +35,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../view_map/Interface1D.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -41,7 +39,7 @@ extern PyTypeObject Interface1D_Type;
/*---------------------------Python BPy_Interface1D structure definition----------*/
typedef struct {
PyObject_HEAD Interface1D *if1D;
PyObject_HEAD Freestyle::Interface1D *if1D;
bool borrowed; /* true if *if1D is a borrowed object */
} BPy_Interface1D;

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

@ -36,6 +36,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../system/Iterator.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -40,7 +38,7 @@ extern PyTypeObject Iterator_Type;
/*---------------------------Python BPy_Iterator structure definition----------*/
typedef struct {
PyObject_HEAD Iterator *it;
PyObject_HEAD Freestyle::Iterator *it;
} BPy_Iterator;
/*---------------------------Python BPy_Iterator visible prototypes-----------*/

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

@ -26,6 +26,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*-----------------------BPy_MediumType type definition ------------------------------*/

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

@ -26,8 +26,6 @@ extern "C" {
#include "../stroke/Stroke.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif

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

@ -26,6 +26,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
static PyObject *BPy_Nature_and(PyObject *a, PyObject *b);

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

@ -26,8 +26,6 @@ extern "C" {
#include "../winged_edge/Nature.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif

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

@ -36,6 +36,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../stroke/Operators.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif

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

@ -30,6 +30,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../view_map/Silhouette.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -40,7 +38,7 @@ extern PyTypeObject SShape_Type;
/*---------------------------Python BPy_SShape structure definition----------*/
typedef struct {
PyObject_HEAD SShape *ss;
PyObject_HEAD Freestyle::SShape *ss;
bool borrowed; /* true if *ss is a borrowed object */
} BPy_SShape;

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

@ -26,6 +26,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../stroke/Stroke.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -41,7 +39,7 @@ extern PyTypeObject StrokeAttribute_Type;
/*---------------------------Python BPy_StrokeAttribute structure definition----------*/
typedef struct {
PyObject_HEAD StrokeAttribute *sa;
PyObject_HEAD Freestyle::StrokeAttribute *sa;
bool borrowed; /* true if *sa is a borrowed reference */
} BPy_StrokeAttribute;

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

@ -46,6 +46,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,12 +26,8 @@ extern "C" {
#include "../system/FreestyleConfig.h"
using namespace std;
#include "../stroke/StrokeShader.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -45,7 +41,7 @@ extern PyTypeObject StrokeShader_Type;
/*---------------------------Python BPy_StrokeShader structure definition----------*/
typedef struct {
PyObject_HEAD StrokeShader *ss;
PyObject_HEAD Freestyle::StrokeShader *ss;
} BPy_StrokeShader;
/*---------------------------Python BPy_StrokeShader visible prototypes-----------*/

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

@ -35,6 +35,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../view_map/Functions0D.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif

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

@ -33,6 +33,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../view_map/Functions1D.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif

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

@ -29,6 +29,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../stroke/Predicates0D.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -41,7 +39,7 @@ extern PyTypeObject UnaryPredicate0D_Type;
/*---------------------------Python BPy_UnaryPredicate0D structure definition----------*/
typedef struct {
PyObject_HEAD UnaryPredicate0D *up0D;
PyObject_HEAD Freestyle::UnaryPredicate0D *up0D;
} BPy_UnaryPredicate0D;
/*---------------------------Python BPy_UnaryPredicate0D visible prototypes-----------*/

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

@ -38,6 +38,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../stroke/Predicates1D.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -41,7 +39,7 @@ extern PyTypeObject UnaryPredicate1D_Type;
/*---------------------------Python BPy_UnaryPredicate1D structure definition----------*/
typedef struct {
PyObject_HEAD UnaryPredicate1D *up1D;
PyObject_HEAD Freestyle::UnaryPredicate1D *up1D;
} BPy_UnaryPredicate1D;
/*---------------------------Python BPy_UnaryPredicate1D visible prototypes-----------*/

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

@ -29,6 +29,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../view_map/ViewMap.h"
using namespace Freestyle;
#ifdef __cplusplus
extern "C" {
#endif
@ -40,7 +38,7 @@ extern PyTypeObject ViewMap_Type;
/*---------------------------Python BPy_ViewMap structure definition----------*/
typedef struct {
PyObject_HEAD ViewMap *vm;
PyObject_HEAD Freestyle::ViewMap *vm;
} BPy_ViewMap;
/*---------------------------Python BPy_ViewMap visible prototypes-----------*/

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

@ -29,6 +29,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//-------------------MODULE INITIALIZATION--------------------------------

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

@ -26,8 +26,6 @@ extern "C" {
#include "../view_map/ViewMap.h"
using namespace Freestyle;
#include "BPy_SShape.h"
#ifdef __cplusplus
@ -42,7 +40,7 @@ extern PyTypeObject ViewShape_Type;
/*---------------------------Python BPy_ViewShape structure definition----------*/
typedef struct {
PyObject_HEAD ViewShape *vs;
PyObject_HEAD Freestyle::ViewShape *vs;
bool borrowed; /* true if *vs a borrowed object */
BPy_SShape *py_ss;
} BPy_ViewShape;

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

@ -24,6 +24,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -24,6 +24,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -24,6 +24,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -24,6 +24,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

2
source/blender/freestyle/intern/python/Director.cpp
View File

@ -56,6 +56,8 @@
#include "UnaryFunction1D/BPy_UnaryFunction1DVec3f.h"
#include "UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h"
using namespace Freestyle;
// BinaryPredicate0D: __call__
int Director_BPy_BinaryPredicate0D___call__(BinaryPredicate0D *bp0D,
Interface0D &i1,

33
source/blender/freestyle/intern/python/Director.h
View File

@ -34,31 +34,34 @@ class Stroke;
class StrokeShader;
} // namespace Freestyle
using namespace Freestyle;
// BinaryPredicate0D: __call__
int Director_BPy_BinaryPredicate0D___call__(BinaryPredicate0D *bp0D,
Interface0D &i1,
Interface0D &i2);
int Director_BPy_BinaryPredicate0D___call__(Freestyle::BinaryPredicate0D *bp0D,
Freestyle::Interface0D &i1,
Freestyle::Interface0D &i2);
// BinaryPredicate1D: __call__
int Director_BPy_BinaryPredicate1D___call__(BinaryPredicate1D *bp1D,
Interface1D &i1,
Interface1D &i2);
int Director_BPy_BinaryPredicate1D___call__(Freestyle::BinaryPredicate1D *bp1D,
Freestyle::Interface1D &i1,
Freestyle::Interface1D &i2);
// UnaryFunction{0D,1D}: __call__
int Director_BPy_UnaryFunction0D___call__(void *uf0D, void *py_uf0D, Interface0DIterator &if0D_it);
int Director_BPy_UnaryFunction1D___call__(void *uf1D, void *py_uf1D, Interface1D &if1D);
int Director_BPy_UnaryFunction0D___call__(void *uf0D,
void *py_uf0D,
Freestyle::Interface0DIterator &if0D_it);
int Director_BPy_UnaryFunction1D___call__(void *uf1D, void *py_uf1D, Freestyle::Interface1D &if1D);
// UnaryPredicate0D: __call__
int Director_BPy_UnaryPredicate0D___call__(UnaryPredicate0D *up0D, Interface0DIterator &if0D_it);
int Director_BPy_UnaryPredicate0D___call__(Freestyle::UnaryPredicate0D *up0D,
Freestyle::Interface0DIterator &if0D_it);
// UnaryPredicate1D: __call__
int Director_BPy_UnaryPredicate1D___call__(UnaryPredicate1D *up1D, Interface1D &if1D);
int Director_BPy_UnaryPredicate1D___call__(Freestyle::UnaryPredicate1D *up1D,
Freestyle::Interface1D &if1D);
// StrokeShader: shade
int Director_BPy_StrokeShader_shade(StrokeShader *ss, Stroke &s);
int Director_BPy_StrokeShader_shade(Freestyle::StrokeShader *ss, Freestyle::Stroke &s);
// ChainingIterator: init, traverse
int Director_BPy_ChainingIterator_init(ChainingIterator *c_it);
int Director_BPy_ChainingIterator_traverse(ChainingIterator *c_it, AdjacencyIterator &a_it);
int Director_BPy_ChainingIterator_init(Freestyle::ChainingIterator *c_it);
int Director_BPy_ChainingIterator_traverse(Freestyle::ChainingIterator *c_it,
Freestyle::AdjacencyIterator &a_it);

2
source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
View File

@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------CurvePoint methods----------------------------*/

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

@ -37,7 +37,7 @@ extern PyTypeObject CurvePoint_Type;
/*---------------------------Python BPy_CurvePoint structure definition----------*/
typedef struct {
BPy_Interface0D py_if0D;
CurvePoint *cp;
Freestyle::CurvePoint *cp;
} BPy_CurvePoint;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
View File

@ -28,6 +28,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------SVertex methods ----------------------------*/

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

@ -37,7 +37,7 @@ extern PyTypeObject SVertex_Type;
/*---------------------------Python BPy_SVertex structure definition----------*/
typedef struct {
BPy_Interface0D py_if0D;
SVertex *sv;
Freestyle::SVertex *sv;
} BPy_SVertex;
/*---------------------------Python BPy_SVertex visible prototypes-----------*/

2
source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
View File

@ -28,6 +28,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------ViewVertex methods----------------------------*/

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

@ -37,7 +37,7 @@ extern PyTypeObject ViewVertex_Type;
/*---------------------------Python BPy_ViewVertex structure definition----------*/
typedef struct {
BPy_Interface0D py_if0D;
ViewVertex *vv;
Freestyle::ViewVertex *vv;
} BPy_ViewVertex;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
View File

@ -29,6 +29,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -38,7 +38,7 @@ extern PyTypeObject StrokeVertex_Type;
/*---------------------------Python BPy_StrokeVertex structure definition----------*/
typedef struct {
BPy_CurvePoint py_cp;
StrokeVertex *sv;
Freestyle::StrokeVertex *sv;
} BPy_StrokeVertex;
/*---------------------------Python BPy_StrokeVertex visible prototypes-----------*/

2
source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
View File

@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------NonTVertex methods ----------------------------*/

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

@ -37,7 +37,7 @@ extern PyTypeObject NonTVertex_Type;
/*---------------------------Python BPy_NonTVertex structure definition----------*/
typedef struct {
BPy_ViewVertex py_vv;
NonTVertex *ntv;
Freestyle::NonTVertex *ntv;
} BPy_NonTVertex;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
View File

@ -30,6 +30,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------TVertex methods ----------------------------*/

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

@ -37,7 +37,7 @@ extern PyTypeObject TVertex_Type;
/*---------------------------Python BPy_TVertex structure definition----------*/
typedef struct {
BPy_ViewVertex py_vv;
TVertex *tv;
Freestyle::TVertex *tv;
} BPy_TVertex;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
View File

@ -30,6 +30,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------FEdge methods ----------------------------*/

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

@ -37,7 +37,7 @@ extern PyTypeObject FEdge_Type;
/*---------------------------Python BPy_FEdge structure definition----------*/
typedef struct {
BPy_Interface1D py_if1D;
FEdge *fe;
Freestyle::FEdge *fe;
} BPy_FEdge;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
View File

@ -29,6 +29,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------CurvePoint methods ----------------------------*/

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

@ -37,7 +37,7 @@ extern PyTypeObject FrsCurve_Type;
/*---------------------------Python BPy_FrsCurve structure definition----------*/
typedef struct {
BPy_Interface1D py_if1D;
Curve *c;
Freestyle::Curve *c;
} BPy_FrsCurve;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
View File

@ -31,6 +31,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------Stroke methods ----------------------------*/

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

@ -37,7 +37,7 @@ extern PyTypeObject Stroke_Type;
/*---------------------------Python BPy_Stroke structure definition----------*/
typedef struct {
BPy_Interface1D py_if1D;
Stroke *s;
Freestyle::Stroke *s;
} BPy_Stroke;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
View File

@ -32,6 +32,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------ViewEdge methods ----------------------------*/

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

@ -37,7 +37,7 @@ extern PyTypeObject ViewEdge_Type;
/*---------------------------Python BPy_ViewEdge structure definition----------*/
typedef struct {
BPy_Interface1D py_if1D;
ViewEdge *ve;
Freestyle::ViewEdge *ve;
} BPy_ViewEdge;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
View File

@ -28,6 +28,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------Chain methods ----------------------------*/

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

@ -37,7 +37,7 @@ extern PyTypeObject Chain_Type;
/*---------------------------Python BPy_Chain structure definition----------*/
typedef struct {
BPy_FrsCurve py_c;
Chain *c;
Freestyle::Chain *c;
} BPy_Chain;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
View File

@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------FEdgeSharp methods ----------------------------*/

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

@ -37,7 +37,7 @@ extern PyTypeObject FEdgeSharp_Type;
/*---------------------------Python BPy_FEdgeSharp structure definition----------*/
typedef struct {
BPy_FEdge py_fe;
FEdgeSharp *fes;
Freestyle::FEdgeSharp *fes;
} BPy_FEdgeSharp;
/*---------------------------Python BPy_FEdgeSharp visible prototypes-----------*/

2
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
View File

@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
/*----------------------FEdgeSmooth methods ----------------------------*/

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

@ -38,7 +38,7 @@ extern PyTypeObject FEdgeSmooth_Type;
/*---------------------------Python BPy_FEdgeSmooth structure definition----------*/
typedef struct {
BPy_FEdge py_fe;
FEdgeSmooth *fes;
Freestyle::FEdgeSmooth *fes;
} BPy_FEdgeSmooth;
/*---------------------------Python BPy_FEdgeSmooth visible prototypes-----------*/

2
source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
View File

@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -38,7 +38,7 @@ extern PyTypeObject AdjacencyIterator_Type;
/*---------------------------Python BPy_AdjacencyIterator structure definition----------*/
typedef struct {
BPy_Iterator py_it;
AdjacencyIterator *a_it;
Freestyle::AdjacencyIterator *a_it;
bool at_start;
} BPy_AdjacencyIterator;

2
source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
View File

@ -29,6 +29,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -38,7 +38,7 @@ extern PyTypeObject ChainPredicateIterator_Type;
/*---------------------------Python BPy_ChainPredicateIterator structure definition----------*/
typedef struct {
BPy_ChainingIterator py_c_it;
ChainPredicateIterator *cp_it;
Freestyle::ChainPredicateIterator *cp_it;
PyObject *upred;
PyObject *bpred;
} BPy_ChainPredicateIterator;

2
source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
View File

@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -38,7 +38,7 @@ extern PyTypeObject ChainSilhouetteIterator_Type;
/*---------------------------Python BPy_ChainSilhouetteIterator structure definition----------*/
typedef struct {
BPy_ChainingIterator py_c_it;
ChainSilhouetteIterator *cs_it;
Freestyle::ChainSilhouetteIterator *cs_it;
} BPy_ChainSilhouetteIterator;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
View File

@ -29,6 +29,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -38,7 +38,7 @@ extern PyTypeObject ChainingIterator_Type;
/*---------------------------Python BPy_ChainingIterator structure definition----------*/
typedef struct {
BPy_ViewEdgeIterator py_ve_it;
ChainingIterator *c_it;
Freestyle::ChainingIterator *c_it;
} BPy_ChainingIterator;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
View File

@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -38,7 +38,7 @@ extern PyTypeObject CurvePointIterator_Type;
/*---------------------------Python BPy_CurvePointIterator structure definition----------*/
typedef struct {
BPy_Iterator py_it;
CurveInternal::CurvePointIterator *cp_it;
Freestyle::CurveInternal::CurvePointIterator *cp_it;
} BPy_CurvePointIterator;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
View File

@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -38,7 +38,7 @@ extern PyTypeObject Interface0DIterator_Type;
/*---------------------------Python BPy_Interface0DIterator structure definition----------*/
typedef struct {
BPy_Iterator py_it;
Interface0DIterator *if0D_it;
Freestyle::Interface0DIterator *if0D_it;
bool reversed;
bool at_start;
} BPy_Interface0DIterator;

2
source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
View File

@ -28,6 +28,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -38,7 +38,7 @@ extern PyTypeObject SVertexIterator_Type;
/*---------------------------Python BPy_SVertexIterator structure definition----------*/
typedef struct {
BPy_Iterator py_it;
ViewEdgeInternal::SVertexIterator *sv_it;
Freestyle::ViewEdgeInternal::SVertexIterator *sv_it;
} BPy_SVertexIterator;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
View File

@ -28,6 +28,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -38,7 +38,7 @@ extern PyTypeObject StrokeVertexIterator_Type;
/*---------------------------Python BPy_StrokeVertexIterator structure definition----------*/
typedef struct {
BPy_Iterator py_it;
StrokeInternal::StrokeVertexIterator *sv_it;
Freestyle::StrokeInternal::StrokeVertexIterator *sv_it;
bool reversed;
/* attribute to make next() work correctly */
bool at_start;

2
source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
View File

@ -27,6 +27,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -38,7 +38,7 @@ extern PyTypeObject ViewEdgeIterator_Type;
/*---------------------------Python BPy_ViewEdgeIterator structure definition----------*/
typedef struct {
BPy_Iterator py_it;
ViewEdgeInternal::ViewEdgeIterator *ve_it;
Freestyle::ViewEdgeInternal::ViewEdgeIterator *ve_it;
} BPy_ViewEdgeIterator;
///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
View File

@ -26,6 +26,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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

@ -38,7 +38,7 @@ extern PyTypeObject orientedViewEdgeIterator_Type;
/*---------------------------Python BPy_orientedViewEdgeIterator structure definition----------*/
typedef struct {
BPy_Iterator py_it;
ViewVertexInternal::orientedViewEdgeIterator *ove_it;
Freestyle::ViewVertexInternal::orientedViewEdgeIterator *ove_it;
bool reversed;
bool at_start;
} BPy_orientedViewEdgeIterator;

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

@ -26,6 +26,8 @@
extern "C" {
#endif
using namespace Freestyle;
///////////////////////////////////////////////////////////////////////////////////////////
//------------------------INSTANCE METHODS ----------------------------------

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