Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-04-17 07:25:41 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-04-17 09:37:07 +0400
commit5d4a6a94ef40f8ae8c49d8fd8fc65384324cb03c (patch)
tree42387e363c64f488beb00cd1a2139f17ce96fda5 /source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
parent5db8da81055be7fb89b4d824ce17e61ffeb46060 (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/BPy_Stroke.h')
-rw-r--r--source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h3
1 files changed, 1 insertions, 2 deletions
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 <Python.h>
-
extern PyTypeObject Stroke_Type;
#define BPy_Stroke_Check(v) (((PyObject *)v)->ob_type == &Stroke_Type)