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/StrokeShader | |
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/StrokeShader')
22 files changed, 0 insertions, 44 deletions
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h index c9059eb96f2..82d39a853bd 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject BackboneStretcherShader_Type; #define BPy_BackboneStretcherShader_Check(v) \ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h index ad967a76fd3..6982661366f 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject BezierCurveShader_Type; #define BPy_BezierCurveShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&BezierCurveShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h index bc94ad95442..6212a8f1d44 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject CalligraphicShader_Type; #define BPy_CalligraphicShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CalligraphicShader_Type) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h index 8be7f8b7b2d..5bce58f9f10 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ColorNoiseShader_Type; #define BPy_ColorNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ColorNoiseShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h index 4ec22d3e9f3..af5cf17caff 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ColorVariationPatternShader_Type; #define BPy_ColorVariationPatternShader_Check(v) \ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h index 5de697e62d8..a34db21a873 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ConstantColorShader_Type; #define BPy_ConstantColorShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstantColorShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h index 6334283aff4..237b550b557 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ConstantThicknessShader_Type; #define BPy_ConstantThicknessShader_Check(v) \ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h index ccaf0708a74..124ce33aa8b 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ConstrainedIncreasingThicknessShader_Type; #define BPy_ConstrainedIncreasingThicknessShader_Check(v) \ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h index 1d08aa5578e..0fc4ce822c3 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject GuidingLinesShader_Type; #define BPy_GuidingLinesShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GuidingLinesShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h index 729aef5e772..db51fac1bd6 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject IncreasingColorShader_Type; #define BPy_IncreasingColorShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&IncreasingColorShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h index 8f44deb354f..809921ffe93 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject IncreasingThicknessShader_Type; #define BPy_IncreasingThicknessShader_Check(v) \ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h index 503e66d4b4c..023c8ff9fad 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject PolygonalizationShader_Type; #define BPy_PolygonalizationShader_Check(v) \ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h index 26e73b2721a..ece206a5be4 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject SamplingShader_Type; #define BPy_SamplingShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SamplingShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h index fa7e924509b..5f45397c06a 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject SmoothingShader_Type; #define BPy_SmoothingShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SmoothingShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h index 03fc5727246..d7dfe6a6644 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject SpatialNoiseShader_Type; #define BPy_SpatialNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SpatialNoiseShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h index 9d106cac065..d025e8b7c2d 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject StrokeTextureShader_Type; #define BPy_StrokeTextureShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeTextureShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h index c3302a617b7..046f785dc57 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject TextureAssignerShader_Type; #define BPy_TextureAssignerShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TextureAssignerShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h index 6dc6d0df90f..3dd77c750f7 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ThicknessNoiseShader_Type; #define BPy_ThicknessNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ThicknessNoiseShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h index 160fba19983..604e875f815 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject ThicknessVariationPatternShader_Type; #define BPy_ThicknessVariationPatternShader_Check(v) \ diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h index f8ef5aed6a3..c0c5b024153 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject TipRemoverShader_Type; #define BPy_TipRemoverShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TipRemoverShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h index 65d77860352..9f2371a3756 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject fstreamShader_Type; #define BPy_fstreamShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&fstreamShader_Type)) diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h index 281dab51f4a..047ff4b58b5 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h @@ -33,8 +33,6 @@ extern "C" { /////////////////////////////////////////////////////////////////////////////////////////// -#include <Python.h> - extern PyTypeObject streamShader_Type; #define BPy_streamShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&streamShader_Type)) |