soc-2008-mxcurioni: renamed all Freestyle API related files with 'BPy_' prefix to avoid library name collision.

Included MediumType's initialization at proper time to avoid Blender's crash.

10 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
index e1cf63727e5..6765bc84baa 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
@@ -1,6 +1,6 @@
-#include "CurvePoint.h"
+#include "BPy_CurvePoint.h"
 
-#include "../Convert.h"
+#include "../BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
index e40f261504f..c2a8023b745 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
@@ -1,7 +1,7 @@
 #ifndef FREESTYLE_PYTHON_CURVEPOINT_H
 #define FREESTYLE_PYTHON_CURVEPOINT_H
 
-#include "../Interface0D.h"
+#include "../BPy_Interface0D.h"
 #include "../../stroke/Curve.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
index d0c622d1df2..bbfff34cb20 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
@@ -1,7 +1,7 @@
-#include "SVertex.h"
+#include "BPy_SVertex.h"
 
-#include "../Convert.h"
-#include "../Id.h"
+#include "../BPy_Convert.h"
+#include "../BPy_Id.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
index 099417b5139..95b7d833d65 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
@@ -2,7 +2,7 @@
 #define FREESTYLE_PYTHON_SVERTEX_H
 
 #include "../../view_map/Silhouette.h"
-#include "../Interface0D.h"
+#include "../BPy_Interface0D.h"
 
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
index 6168d1fb711..7e6ef8590fd 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
@@ -1,6 +1,6 @@
-#include "ViewVertex.h"
+#include "BPy_ViewVertex.h"
 
-#include "../Convert.h"
+#include "../BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
index 98bcb9bac90..b70a69c95e7 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
@@ -2,7 +2,7 @@
 #define FREESTYLE_PYTHON_VIEWVERTEX_H
 
 #include "../../view_map/ViewMap.h"
-#include "../Interface0D.h"
+#include "../BPy_Interface0D.h"
 
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
index 9d07125476e..2039b165457 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
@@ -1,7 +1,7 @@
-#include "StrokeVertex.h"
+#include "BPy_StrokeVertex.h"
 
-#include "../../Convert.h"
-#include "../../StrokeAttribute.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_StrokeAttribute.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
index 4bc33ea4058..f1c54ed0041 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
@@ -1,7 +1,7 @@
 #ifndef FREESTYLE_PYTHON_STROKEVERTEX_H
 #define FREESTYLE_PYTHON_STROKEVERTEX_H
 
-#include "../CurvePoint.h"
+#include "../BPy_CurvePoint.h"
 #include "../../../stroke/Stroke.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
index 772a385139e..772a385139e 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
index 715170c1422..715170c1422 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp