From 5d4a6a94ef40f8ae8c49d8fd8fc65384324cb03c Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 17 Apr 2014 12:25:41 +0900 Subject: Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions (Part 2). (See commit e1771e72fbbf828dbf5bed871b814288389f3611 for more detail of the problem). Fixed for #include not properly put in the extern "C" { ... } construct. Also removed redundant inclusion of the header file in the Freestyle Python API code. --- source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h') diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h index 0ceaf3ec9f5..a22e5c2d006 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h @@ -26,6 +26,7 @@ #define __FREESTYLE_PYTHON_STROKE_H__ #include "../BPy_Interface1D.h" + #include "../../stroke/Stroke.h" #ifdef __cplusplus @@ -34,8 +35,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject Stroke_Type; #define BPy_Stroke_Check(v) (((PyObject *)v)->ob_type == &Stroke_Type) -- cgit v1.2.3