[Bf-blender-cvs] [cd9acfed4f7] master: Cleanup: use preprocessor version check for PyTypeObject declaration
Campbell Barton
noreply at git.blender.org
Tue Nov 10 23:12:33 CET 2020
Commit: cd9acfed4f7674b84be965d469a367aef96f8af3
Author: Campbell Barton
Date: Wed Nov 11 08:36:54 2020 +1100
Branches: master
https://developer.blender.org/rBcd9acfed4f7674b84be965d469a367aef96f8af3
Cleanup: use preprocessor version check for PyTypeObject declaration
While `tp_print` was deprecated, Python 3.8+ uses this for
'tp_vectorcall_offset' which wasn't stated in the comment from
efd71aad4f22ec0073d80b8dd296015d3f395aa8.
Instead of suppressing clang-tidy, use preprocessor a check since
this properly represents the difference between Python versions.
===================================================================
M source/blender/freestyle/intern/python/BPy_BBox.cpp
M source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
M source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
M source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
M source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
M source/blender/freestyle/intern/python/BPy_Id.cpp
M source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
M source/blender/freestyle/intern/python/BPy_Interface0D.cpp
M source/blender/freestyle/intern/python/BPy_Interface1D.cpp
M source/blender/freestyle/intern/python/BPy_Iterator.cpp
M source/blender/freestyle/intern/python/BPy_MediumType.cpp
M source/blender/freestyle/intern/python/BPy_Nature.cpp
M source/blender/freestyle/intern/python/BPy_Operators.cpp
M source/blender/freestyle/intern/python/BPy_SShape.cpp
M source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
M source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
M source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
M source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
M source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
M source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
M source/blender/freestyle/intern/python/BPy_ViewMap.cpp
M source/blender/freestyle/intern/python/BPy_ViewShape.cpp
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
M source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
M source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
M source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
M source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
M source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
M source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
M source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
M source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
M source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
M source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
M source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
M source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
M source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
M source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
M source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
M source/blender/python/bmesh/bmesh_py_ops.c
M source/blender/python/generic/idprop_py_api.c
M source/blender/python/generic/imbuf_py_api.c
M source/blender/python/intern/bpy_app_translations.c
M source/blender/python/intern/bpy_library_load.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/mathutils/mathutils_Vector.c
===================================================================
diff --git a/source/blender/freestyle/intern/python/BPy_BBox.cpp b/source/blender/freestyle/intern/python/BPy_BBox.cpp
index 4e0da4e87cf..d66a74bc83f 100644
--- a/source/blender/freestyle/intern/python/BPy_BBox.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BBox.cpp
@@ -80,9 +80,11 @@ PyTypeObject BBox_Type = {
sizeof(BPy_BBox), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)BBox_dealloc, /* tp_dealloc */
- /* Incompatible with Python3.8+ (deprecated function).
- * NOLINTNEXTLINE: modernize-use-nullptr. */
- 0, /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+ 0, /* tp_vectorcall_offset */
+#else
+ nullptr, /* tp_print */
+#endif
nullptr, /* tp_getattr */
nullptr, /* tp_setattr */
nullptr, /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
index 8f4718e774f..2359d79f7d0 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
@@ -153,9 +153,11 @@ PyTypeObject BinaryPredicate0D_Type = {
sizeof(BPy_BinaryPredicate0D), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)BinaryPredicate0D___dealloc__, /* tp_dealloc */
- /* Incompatible with Python3.8+ (deprecated function).
- * NOLINTNEXTLINE: modernize-use-nullptr. */
- 0, /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+ 0, /* tp_vectorcall_offset */
+#else
+ nullptr, /* tp_print */
+#endif
nullptr, /* tp_getattr */
nullptr, /* tp_setattr */
nullptr, /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
index 31500186ab4..7d554e0abe1 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
@@ -187,9 +187,11 @@ PyTypeObject BinaryPredicate1D_Type = {
sizeof(BPy_BinaryPredicate1D), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)BinaryPredicate1D___dealloc__, /* tp_dealloc */
- /* Incompatible with Python3.8+ (deprecated function).
- * NOLINTNEXTLINE: modernize-use-nullptr. */
- 0, /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+ 0, /* tp_vectorcall_offset */
+#else
+ nullptr, /* tp_print */
+#endif
nullptr, /* tp_getattr */
nullptr, /* tp_setattr */
nullptr, /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
index bb0dbb02049..2aa08ec3ab5 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -538,9 +538,11 @@ PyTypeObject FrsMaterial_Type = {
sizeof(BPy_FrsMaterial), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)FrsMaterial_dealloc, /* tp_dealloc */
- /* Incompatible with Python3.8+ (deprecated function).
- * NOLINTNEXTLINE: modernize-use-nullptr. */
- 0, /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+ 0, /* tp_vectorcall_offset */
+#else
+ nullptr, /* tp_print */
+#endif
nullptr, /* tp_getattr */
nullptr, /* tp_setattr */
nullptr, /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
index ebea140b9b5..943a9ca0e64 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
@@ -330,9 +330,11 @@ PyTypeObject FrsNoise_Type = {
sizeof(BPy_FrsNoise), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)FrsNoise_dealloc, /* tp_dealloc */
- /* Incompatible with Python3.8+ (deprecated function).
- * NOLINTNEXTLINE: modernize-use-nullptr. */
- 0, /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+ 0, /* tp_vectorcall_offset */
+#else
+ nullptr, /* tp_print */
+#endif
nullptr, /* tp_getattr */
nullptr, /* tp_setattr */
nullptr, /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp
index 515f6525648..323e76fe249 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Id.cpp
@@ -171,9 +171,11 @@ PyTypeObject Id_Type = {
sizeof(BPy_Id), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)Id_dealloc, /* tp_dealloc */
- /* Incompatible with Python3.8+ (deprecated function).
- * NOLINTNEXTLINE: modernize-use-nullptr. */
- 0, /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+ 0, /* tp_vectorcall_offset */
+#else
+ nullptr, /* tp_print */
+#endif
nullptr, /* tp_getattr */
nullptr, /* tp_setattr */
nullptr, /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
index 2cceedbbb28..25f3c54ea7d 100644
--- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
@@ -153,9 +153,11 @@ PyTypeObject IntegrationType_Type = {
sizeof(PyLongObject), /* tp_basicsize */
0, /* tp_itemsize */
nullptr, /* tp_dealloc */
- /* Incompatible with Python3.8+ (deprecated function).
- * NOLINTNEXTLINE: modernize-use-nullptr. */
- 0, /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+ 0, /* tp_vectorcall_offset */
+#else
+ nullptr, /* tp_print */
+#endif
nullptr, /* tp_getattr */
nullptr, /* tp_setattr */
nullptr, /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
index 5a7d38055f1..3d0c57d5509 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
@@ -313,9 +313,11 @@ PyTypeObject Interface0D_Type = {
sizeof(BPy_Interface0D), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)Interface0D_dealloc, /* tp_dealloc */
- /* Incompatible with Python3.8+ (deprecated function).
- * NOLINTNEXTLINE: modernize-use-nullptr. */
- 0, /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+ 0, /* tp_vectorcall_offset */
+#else
+ nullptr, /* tp_print */
+#endif
nullptr, /* tp_getattr */
nullptr, /* tp_setattr */
nullptr, /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index 8225076397c..8a4a6eb61db 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -341,9 +341,11 @@ PyTypeObject Interface1D_Type = {
sizeof(BPy_Interface1D), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)Interface1D_dealloc, /* tp_dealloc */
- /* Incompatible with Python3.8+ (deprecated function).
- * NOLINTNEXTLINE: modernize-use-nullptr. */
- 0, /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+ 0, /* tp_vectorcall_offset */
+#else
+ nullptr, /* tp_print */
+#endif
nullptr, /* tp_getattr */
nullptr, /* tp_setattr */
nullptr, /* tp_reserved */
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index 4a6f56f8f8c..bee30aa9e8c 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -228,9 +228,11 @@ PyTypeObject Iterator_Type = {
sizeof(BPy_Iterator), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)Iterator_dealloc, /* tp_dealloc */
- /* Incompatible with Python3.8+ (deprecated function).
- * NOLINTNEXTLINE: modernize-use-nullptr. */
- 0, /* tp_print */
+#if PY_VERSION_HEX >= 0x03080000
+ 0, /* tp_vectorcall_offset */
+#else
+ nullptr, /* tp_print */
+#endif
nullptr, /* tp_getattr */
nullptr,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list