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/Iterator/BPy_ViewEdgeIterator.h | |
| 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/Iterator/BPy_ViewEdgeIterator.h')
| -rw-r--r-- | source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h index eb11dd6cdea..47244dcb5f2 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h @@ -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)) |