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. --- .../python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material') diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h index 3b70ae85374..d080976d7db 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include - extern PyTypeObject MaterialF0D_Type; #define BPy_MaterialF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&MaterialF0D_Type)) -- cgit v1.2.3