diff options
Diffstat (limited to 'source/blender/freestyle/intern/python')
25 files changed, 55 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h index 00e88058974..6f8a3d21c50 100644 --- a/source/blender/freestyle/intern/python/BPy_BBox.h +++ b/source/blender/freestyle/intern/python/BPy_BBox.h @@ -29,7 +29,9 @@ #include "../geometry/BBox.h" #include "../geometry/Geom.h" -using namespace Geometry; + +using namespace Freestyle; +using namespace Freestyle::Geometry; #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h index 70fb2394389..9622ca1eb98 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h @@ -29,6 +29,8 @@ #include "../stroke/Predicates0D.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h index 144d2094d94..07a3d2986ce 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h @@ -29,6 +29,8 @@ #include "../stroke/Predicates1D.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp b/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp index d9d49236b13..e44dfdf0bae 100644 --- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp +++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp @@ -27,6 +27,8 @@ #include "../stroke/ContextFunctions.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h index 098272da1d5..1df4901757b 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.h +++ b/source/blender/freestyle/intern/python/BPy_Convert.h @@ -29,7 +29,9 @@ #include <typeinfo> #include "../geometry/Geom.h" -using namespace Geometry; + +using namespace Freestyle; +using namespace Freestyle::Geometry; // BBox #include "../geometry/BBox.h" diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h index e533a870409..62a9f2c9a78 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h +++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h @@ -29,6 +29,8 @@ #include "../scene_graph/FrsMaterial.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.h b/source/blender/freestyle/intern/python/BPy_FrsNoise.h index 0ef4e23226d..14d8696d0cb 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsNoise.h +++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.h @@ -29,6 +29,8 @@ #include "../geometry/Noise.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_Id.h b/source/blender/freestyle/intern/python/BPy_Id.h index 78fdfcd2384..d4b635a4ea5 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.h +++ b/source/blender/freestyle/intern/python/BPy_Id.h @@ -27,10 +27,13 @@ #include <Python.h> #include <iostream> + using namespace std; #include "../system/Id.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.h b/source/blender/freestyle/intern/python/BPy_IntegrationType.h index 801a2a9f703..36b925f1ee7 100644 --- a/source/blender/freestyle/intern/python/BPy_IntegrationType.h +++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.h @@ -29,6 +29,8 @@ #include "../view_map/Interface1D.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.h b/source/blender/freestyle/intern/python/BPy_Interface0D.h index 905281b8a40..02929bcdbc7 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.h +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.h @@ -29,6 +29,8 @@ #include "../view_map/Interface0D.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.h b/source/blender/freestyle/intern/python/BPy_Interface1D.h index 053021423cc..9bc447725e9 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.h +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.h @@ -29,6 +29,8 @@ #include "../view_map/Interface1D.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.h b/source/blender/freestyle/intern/python/BPy_Iterator.h index ad86dec7278..a739787aa85 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.h +++ b/source/blender/freestyle/intern/python/BPy_Iterator.h @@ -29,6 +29,8 @@ #include "../system/Iterator.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_MediumType.h b/source/blender/freestyle/intern/python/BPy_MediumType.h index 92efefd02c7..120829e0b40 100644 --- a/source/blender/freestyle/intern/python/BPy_MediumType.h +++ b/source/blender/freestyle/intern/python/BPy_MediumType.h @@ -29,6 +29,8 @@ #include "../stroke/Stroke.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_Nature.h b/source/blender/freestyle/intern/python/BPy_Nature.h index 3d7514ecf60..0b9901bbe06 100644 --- a/source/blender/freestyle/intern/python/BPy_Nature.h +++ b/source/blender/freestyle/intern/python/BPy_Nature.h @@ -29,6 +29,8 @@ #include "../winged_edge/Nature.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_Operators.h b/source/blender/freestyle/intern/python/BPy_Operators.h index a38feec89c8..be9514f46d8 100644 --- a/source/blender/freestyle/intern/python/BPy_Operators.h +++ b/source/blender/freestyle/intern/python/BPy_Operators.h @@ -29,6 +29,8 @@ #include "../stroke/Operators.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_SShape.h b/source/blender/freestyle/intern/python/BPy_SShape.h index 996c9c6c50f..8e7d3b63582 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.h +++ b/source/blender/freestyle/intern/python/BPy_SShape.h @@ -29,6 +29,8 @@ #include "../view_map/Silhouette.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h index 3951e87c38c..6d30b6b1421 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h +++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h @@ -29,6 +29,8 @@ #include "../stroke/Stroke.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.h b/source/blender/freestyle/intern/python/BPy_StrokeShader.h index 76799f5fe54..19af6006c10 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeShader.h +++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.h @@ -33,6 +33,8 @@ using namespace std; #include "../stroke/StrokeShader.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h index c01fb527740..3b6a2ab79e6 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h @@ -29,6 +29,8 @@ #include "../view_map/Functions0D.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h index e08d1d6e9fb..87c4430fd14 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h @@ -29,6 +29,8 @@ #include "../view_map/Functions1D.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h index 455fd30bce7..0101a5f508a 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h @@ -29,6 +29,8 @@ #include "../stroke/Predicates0D.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h index 9454c020228..fd37e1dc13a 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h @@ -29,6 +29,8 @@ #include "../stroke/Predicates1D.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.h b/source/blender/freestyle/intern/python/BPy_ViewMap.h index ce972dba204..5150c6fbebd 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewMap.h +++ b/source/blender/freestyle/intern/python/BPy_ViewMap.h @@ -29,6 +29,8 @@ #include "../view_map/ViewMap.h" +using namespace Freestyle; + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.h b/source/blender/freestyle/intern/python/BPy_ViewShape.h index 06ca9284252..7727b131e1b 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.h +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.h @@ -29,6 +29,8 @@ #include "../view_map/ViewMap.h" +using namespace Freestyle; + #include "BPy_SShape.h" #ifdef __cplusplus diff --git a/source/blender/freestyle/intern/python/Director.h b/source/blender/freestyle/intern/python/Director.h index 4d825828f53..d58a51b65b2 100644 --- a/source/blender/freestyle/intern/python/Director.h +++ b/source/blender/freestyle/intern/python/Director.h @@ -25,6 +25,7 @@ #ifndef __FREESTYLE_PYTHON_DIRECTOR_H__ #define __FREESTYLE_PYTHON_DIRECTOR_H__ +namespace Freestyle { class UnaryPredicate0D; class UnaryPredicate1D; class BinaryPredicate0D; @@ -36,6 +37,9 @@ class Interface1D; class Interface0DIterator; class Stroke; class StrokeShader; +} + +using namespace Freestyle; #ifdef __cplusplus extern "C" { |