Blender Git Loki

Git Commits -> Revision 5d4a6a9

Revision 5d4a6a9 by Tamito Kajiyama (master)
April 17, 2014, 05:37 (GMT)
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.

Commit Details:

Full Hash: 5d4a6a94ef40f8ae8c49d8fd8fc65384324cb03c
Parent Commit: 5db8da8
Lines Changed: +83, -286

157 Modified Paths:

/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/BPy_BBox.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_ContextFunctions.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_Convert.h (+3, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_Freestyle.h (+2, -2) (Diff)
/source/blender/freestyle/intern/python/BPy_FrsMaterial.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_FrsNoise.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_Id.h (+3, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_IntegrationType.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_Interface0D.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_Interface1D.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_Iterator.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_MediumType.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_Nature.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_Operators.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_SShape.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_StrokeShader.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_ViewMap.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_ViewShape.h (+2, -0) (Diff)
/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h (+1, -2) (Diff)
/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h (+1, -3) (Diff)
/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h (+2, -3) (Diff)
/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h (+1, -2) (Diff)
/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h (+1, -2) (Diff)
/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h (+1, -2) (Diff)
/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h (+1, -2) (Diff)
/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h (+1, -2) (Diff)
/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h (+1, -2) (Diff)
/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h (+2, -4) (Diff)
/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h (+1, -2) (Diff)
/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h (+1, -2) (Diff)
/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h (+1, -2) (Diff)
/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h (+1, -3) (Diff)
/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h (+1, -4) (Diff)
/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h (+1, -4) (Diff)
/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h (+1, -4) (Diff)
/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h (+2, -4) (Diff)
/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h (+1, -3) (Diff)
/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h (+2, -4) (Diff)
/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h (+2, -4) (Diff)
/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h (+1, -4) (Diff)
/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h (+1, -4) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h (+0, -2) (Diff)
/source/blender/freestyle/intern/system/PythonInterpreter.h (+3, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021