diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-17 07:25:41 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-17 09:37:07 +0400 |
commit | 5d4a6a94ef40f8ae8c49d8fd8fc65384324cb03c (patch) | |
tree | 42387e363c64f488beb00cd1a2139f17ce96fda5 /source/blender/freestyle/intern/python/Interface1D/FEdge | |
parent | 5db8da81055be7fb89b4d824ce17e61ffeb46060 (diff) |
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.
Diffstat (limited to 'source/blender/freestyle/intern/python/Interface1D/FEdge')
-rw-r--r-- | source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h | 3 | ||||
-rw-r--r-- | source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h index 37f678ddd93..1c82453432b 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h @@ -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)) diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h index a88afc24557..f3dfd796418 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h @@ -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)) |