diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-12-20 02:42:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-20 02:42:57 +0300 |
| commit | 9a9f39e4661163391bb8e3eb782438e425abe684 (patch) | |
| tree | e67dc76e18b408a2708dc5b5f7a7b3e89bd552cf /source | |
| parent | 6ccef2aa7e010c1e5b6986a696dc27ef8826c6c2 (diff) | |
Cleanup: remove redundant 'char *' casts
Diffstat (limited to 'source')
73 files changed, 686 insertions, 996 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp index ee207e06b35..a631b45f6d4 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp @@ -139,11 +139,7 @@ static PyObject *BinaryPredicate0D_name_get(BPy_BinaryPredicate0D *self, void *U } static PyGetSetDef BPy_BinaryPredicate0D_getseters[] = { - {(char *)"name", - (getter)BinaryPredicate0D_name_get, - (setter)NULL, - (char *)BinaryPredicate0D_name_doc, - NULL}, + {"name", (getter)BinaryPredicate0D_name_get, (setter)NULL, BinaryPredicate0D_name_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp index 647b5522d35..9add706bea7 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp @@ -175,11 +175,7 @@ static PyObject *BinaryPredicate1D_name_get(BPy_BinaryPredicate1D *self, void *U } static PyGetSetDef BPy_BinaryPredicate1D_getseters[] = { - {(char *)"name", - (getter)BinaryPredicate1D_name_get, - (setter)NULL, - (char *)BinaryPredicate1D_name_doc, - NULL}, + {"name", (getter)BinaryPredicate1D_name_get, (setter)NULL, BinaryPredicate1D_name_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp index 7a5469cd414..2c226e330d7 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp +++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp @@ -459,40 +459,40 @@ static int FrsMaterial_priority_set(BPy_FrsMaterial *self, PyObject *value, void } static PyGetSetDef BPy_FrsMaterial_getseters[] = { - {(char *)"line", + {"line", (getter)FrsMaterial_line_get, (setter)FrsMaterial_line_set, - (char *)FrsMaterial_line_doc, + FrsMaterial_line_doc, NULL}, - {(char *)"diffuse", + {"diffuse", (getter)FrsMaterial_diffuse_get, (setter)FrsMaterial_diffuse_set, - (char *)FrsMaterial_diffuse_doc, + FrsMaterial_diffuse_doc, NULL}, - {(char *)"specular", + {"specular", (getter)FrsMaterial_specular_get, (setter)FrsMaterial_specular_set, - (char *)FrsMaterial_specular_doc, + FrsMaterial_specular_doc, NULL}, - {(char *)"ambient", + {"ambient", (getter)FrsMaterial_ambient_get, (setter)FrsMaterial_ambient_set, - (char *)FrsMaterial_ambient_doc, + FrsMaterial_ambient_doc, NULL}, - {(char *)"emission", + {"emission", (getter)FrsMaterial_emission_get, (setter)FrsMaterial_emission_set, - (char *)FrsMaterial_emission_doc, + FrsMaterial_emission_doc, NULL}, - {(char *)"shininess", + {"shininess", (getter)FrsMaterial_shininess_get, (setter)FrsMaterial_shininess_set, - (char *)FrsMaterial_shininess_doc, + FrsMaterial_shininess_doc, NULL}, - {(char *)"priority", + {"priority", (getter)FrsMaterial_priority_get, (setter)FrsMaterial_priority_set, - (char *)FrsMaterial_priority_doc, + FrsMaterial_priority_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp index 2c50767c5aa..4f61ba847f6 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.cpp +++ b/source/blender/freestyle/intern/python/BPy_Id.cpp @@ -162,8 +162,8 @@ static int Id_second_set(BPy_Id *self, PyObject *value, void *UNUSED(closure)) } static PyGetSetDef BPy_Id_getseters[] = { - {(char *)"first", (getter)Id_first_get, (setter)Id_first_set, (char *)Id_first_doc, NULL}, - {(char *)"second", (getter)Id_second_get, (setter)Id_second_set, (char *)Id_second_doc, NULL}, + {"first", (getter)Id_first_get, (setter)Id_first_set, Id_first_doc, NULL}, + {"second", (getter)Id_second_get, (setter)Id_second_set, Id_second_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp index 40e5267460b..628a9d43b6c 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp @@ -275,42 +275,26 @@ static PyObject *Interface0D_nature_get(BPy_Interface0D *self, void *UNUSED(clos } static PyGetSetDef BPy_Interface0D_getseters[] = { - {(char *)"name", - (getter)Interface0D_name_get, - (setter)NULL, - (char *)Interface0D_name_doc, - NULL}, - {(char *)"point_3d", - (getter)Interface0D_point_3d_get, - (setter)NULL, - (char *)Interface0D_point_3d_doc, - NULL}, - {(char *)"projected_x", + {"name", (getter)Interface0D_name_get, (setter)NULL, Interface0D_name_doc, NULL}, + {"point_3d", (getter)Interface0D_point_3d_get, (setter)NULL, Interface0D_point_3d_doc, NULL}, + {"projected_x", (getter)Interface0D_projected_x_get, (setter)NULL, - (char *)Interface0D_projected_x_doc, + Interface0D_projected_x_doc, NULL}, - {(char *)"projected_y", + {"projected_y", (getter)Interface0D_projected_y_get, (setter)NULL, - (char *)Interface0D_projected_y_doc, + Interface0D_projected_y_doc, NULL}, - {(char *)"projected_z", + {"projected_z", (getter)Interface0D_projected_z_get, (setter)NULL, - (char *)Interface0D_projected_z_doc, - NULL}, - {(char *)"point_2d", - (getter)Interface0D_point_2d_get, - (setter)NULL, - (char *)Interface0D_point_2d_doc, - NULL}, - {(char *)"id", (getter)Interface0D_id_get, (setter)NULL, (char *)Interface0D_id_doc, NULL}, - {(char *)"nature", - (getter)Interface0D_nature_get, - (setter)NULL, - (char *)Interface0D_nature_doc, + Interface0D_projected_z_doc, NULL}, + {"point_2d", (getter)Interface0D_point_2d_get, (setter)NULL, Interface0D_point_2d_doc, NULL}, + {"id", (getter)Interface0D_id_get, (setter)NULL, Interface0D_id_doc, NULL}, + {"nature", (getter)Interface0D_nature_get, (setter)NULL, Interface0D_nature_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp index ca14a473216..af1f8d2d549 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp @@ -318,26 +318,18 @@ static int Interface1D_time_stamp_set(BPy_Interface1D *self, } static PyGetSetDef BPy_Interface1D_getseters[] = { - {(char *)"name", - (getter)Interface1D_name_get, - (setter)NULL, - (char *)Interface1D_name_doc, - NULL}, - {(char *)"id", (getter)Interface1D_id_get, (setter)NULL, (char *)Interface1D_id_doc, NULL}, - {(char *)"nature", - (getter)Interface1D_nature_get, - (setter)NULL, - (char *)Interface1D_nature_doc, - NULL}, - {(char *)"length_2d", + {"name", (getter)Interface1D_name_get, (setter)NULL, Interface1D_name_doc, NULL}, + {"id", (getter)Interface1D_id_get, (setter)NULL, Interface1D_id_doc, NULL}, + {"nature", (getter)Interface1D_nature_get, (setter)NULL, Interface1D_nature_doc, NULL}, + {"length_2d", (getter)Interface1D_length_2d_get, (setter)NULL, - (char *)Interface1D_length_2d_doc, + Interface1D_length_2d_doc, NULL}, - {(char *)"time_stamp", + {"time_stamp", (getter)Interface1D_time_stamp_get, (setter)Interface1D_time_stamp_set, - (char *)Interface1D_time_stamp_doc, + Interface1D_time_stamp_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp index d2575b3b5e9..daa2bdbef81 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp +++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp @@ -217,17 +217,9 @@ static PyObject *Iterator_is_end_get(BPy_Iterator *self, void *UNUSED(closure)) } static PyGetSetDef BPy_Iterator_getseters[] = { - {(char *)"name", (getter)Iterator_name_get, (setter)NULL, (char *)Iterator_name_doc, NULL}, - {(char *)"is_begin", - (getter)Iterator_is_begin_get, - (setter)NULL, - (char *)Iterator_is_begin_doc, - NULL}, - {(char *)"is_end", - (getter)Iterator_is_end_get, - (setter)NULL, - (char *)Iterator_is_end_doc, - NULL}, + {"name", (getter)Iterator_name_get, (setter)NULL, Iterator_name_doc, NULL}, + {"is_begin", (getter)Iterator_is_begin_get, (setter)NULL, Iterator_is_begin_doc, NULL}, + {"is_end", (getter)Iterator_is_end_get, (setter)NULL, Iterator_is_end_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp index d007fead345..d4b5f426a8b 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp @@ -268,23 +268,11 @@ static PyObject *SShape_edges_get(BPy_SShape *self, void *UNUSED(closure)) } static PyGetSetDef BPy_SShape_getseters[] = { - {(char *)"id", (getter)SShape_id_get, (setter)SShape_id_set, (char *)SShape_id_doc, NULL}, - {(char *)"name", - (getter)SShape_name_get, - (setter)SShape_name_set, - (char *)SShape_name_doc, - NULL}, - {(char *)"bbox", - (getter)SShape_bbox_get, - (setter)SShape_bbox_set, - (char *)SShape_bbox_doc, - NULL}, - {(char *)"edges", (getter)SShape_edges_get, (setter)NULL, (char *)SShape_edges_doc, NULL}, - {(char *)"vertices", - (getter)SShape_vertices_get, - (setter)NULL, - (char *)SShape_vertices_doc, - NULL}, + {"id", (getter)SShape_id_get, (setter)SShape_id_set, SShape_id_doc, NULL}, + {"name", (getter)SShape_name_get, (setter)SShape_name_set, SShape_name_doc, NULL}, + {"bbox", (getter)SShape_bbox_get, (setter)SShape_bbox_set, SShape_bbox_doc, NULL}, + {"edges", (getter)SShape_edges_get, (setter)NULL, SShape_edges_doc, NULL}, + {"vertices", (getter)SShape_vertices_get, (setter)NULL, SShape_vertices_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp index e3d6738058e..5f5407e82e3 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp @@ -657,25 +657,25 @@ static int StrokeAttribute_visible_set(BPy_StrokeAttribute *self, } static PyGetSetDef BPy_StrokeAttribute_getseters[] = { - {(char *)"alpha", + {"alpha", (getter)StrokeAttribute_alpha_get, (setter)StrokeAttribute_alpha_set, - (char *)StrokeAttribute_alpha_doc, + StrokeAttribute_alpha_doc, NULL}, - {(char *)"color", + {"color", (getter)StrokeAttribute_color_get, (setter)StrokeAttribute_color_set, - (char *)StrokeAttribute_color_doc, + StrokeAttribute_color_doc, NULL}, - {(char *)"thickness", + {"thickness", (getter)StrokeAttribute_thickness_get, (setter)StrokeAttribute_thickness_set, - (char *)StrokeAttribute_thickness_doc, + StrokeAttribute_thickness_doc, NULL}, - {(char *)"visible", + {"visible", (getter)StrokeAttribute_visible_get, (setter)StrokeAttribute_visible_set, - (char *)StrokeAttribute_visible_doc, + StrokeAttribute_visible_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp index baeb8cc4994..993afc2e32e 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp @@ -273,11 +273,7 @@ static PyObject *StrokeShader_name_get(BPy_StrokeShader *self, void *UNUSED(clos } static PyGetSetDef BPy_StrokeShader_getseters[] = { - {(char *)"name", - (getter)StrokeShader_name_get, - (setter)NULL, - (char *)StrokeShader_name_doc, - NULL}, + {"name", (getter)StrokeShader_name_get, (setter)NULL, StrokeShader_name_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp index 81e72c2c7f2..6214ea94f41 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp @@ -109,11 +109,7 @@ static PyObject *UnaryFunction0D_name_get(BPy_UnaryFunction0D *self, void *UNUSE } static PyGetSetDef BPy_UnaryFunction0D_getseters[] = { - {(char *)"name", - (getter)UnaryFunction0D_name_get, - (setter)NULL, - (char *)UnaryFunction0D_name_doc, - NULL}, + {"name", (getter)UnaryFunction0D_name_get, (setter)NULL, UnaryFunction0D_name_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp index b2bd6e657fe..18d6479a498 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp @@ -103,11 +103,7 @@ static PyObject *UnaryFunction1D_name_get(BPy_UnaryFunction1D *self, void *UNUSE } static PyGetSetDef BPy_UnaryFunction1D_getseters[] = { - {(char *)"name", - (getter)UnaryFunction1D_name_get, - (setter)NULL, - (char *)UnaryFunction1D_name_doc, - NULL}, + {"name", (getter)UnaryFunction1D_name_get, (setter)NULL, UnaryFunction1D_name_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp index f4f1205bb09..3d4191c2c44 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp @@ -154,11 +154,7 @@ static PyObject *UnaryPredicate0D_name_get(BPy_UnaryPredicate0D *self, void *UNU } static PyGetSetDef BPy_UnaryPredicate0D_getseters[] = { - {(char *)"name", - (getter)UnaryPredicate0D_name_get, - (setter)NULL, - (char *)UnaryPredicate0D_name_doc, - NULL}, + {"name", (getter)UnaryPredicate0D_name_get, (setter)NULL, UnaryPredicate0D_name_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp index 8bdd9823140..ba68d21f941 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp @@ -212,11 +212,7 @@ static PyObject *UnaryPredicate1D_name_get(BPy_UnaryPredicate1D *self, void *UNU } static PyGetSetDef BPy_UnaryPredicate1D_getseters[] = { - {(char *)"name", - (getter)UnaryPredicate1D_name_get, - (setter)NULL, - (char *)UnaryPredicate1D_name_doc, - NULL}, + {"name", (getter)UnaryPredicate1D_name_get, (setter)NULL, UnaryPredicate1D_name_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp index b6ca377fb40..1f162997c44 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp @@ -171,10 +171,10 @@ static int ViewMap_scene_bbox_set(BPy_ViewMap *self, PyObject *value, void *UNUS } static PyGetSetDef BPy_ViewMap_getseters[] = { - {(char *)"scene_bbox", + {"scene_bbox", (getter)ViewMap_scene_bbox_get, (setter)ViewMap_scene_bbox_set, - (char *)ViewMap_scene_bbox_doc, + ViewMap_scene_bbox_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp index 79eeba17529..c08e7eea7b9 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp @@ -326,28 +326,24 @@ static PyObject *ViewShape_id_get(BPy_ViewShape *self, void *UNUSED(closure)) } static PyGetSetDef BPy_ViewShape_getseters[] = { - {(char *)"sshape", + {"sshape", (getter)ViewShape_sshape_get, (setter)ViewShape_sshape_set, - (char *)ViewShape_sshape_doc, + ViewShape_sshape_doc, NULL}, - {(char *)"vertices", + {"vertices", (getter)ViewShape_vertices_get, (setter)ViewShape_vertices_set, - (char *)ViewShape_vertices_doc, + ViewShape_vertices_doc, NULL}, - {(char *)"edges", - (getter)ViewShape_edges_get, - (setter)ViewShape_edges_set, - (char *)ViewShape_edges_doc, - NULL}, - {(char *)"name", (getter)ViewShape_name_get, (setter)NULL, (char *)ViewShape_name_doc, NULL}, - {(char *)"library_path", + {"edges", (getter)ViewShape_edges_get, (setter)ViewShape_edges_set, ViewShape_edges_doc, NULL}, + {"name", (getter)ViewShape_name_get, (setter)NULL, ViewShape_name_doc, NULL}, + {"library_path", (getter)ViewShape_library_path_get, (setter)NULL, - (char *)ViewShape_library_path_doc, + ViewShape_library_path_doc, NULL}, - {(char *)"id", (getter)ViewShape_id_get, (setter)NULL, (char *)ViewShape_id_doc, NULL}, + {"id", (getter)ViewShape_id_get, (setter)NULL, ViewShape_id_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp index 49cd98376c5..6af80c4bfd9 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp @@ -233,22 +233,18 @@ static int CurvePoint_t2d_set(BPy_CurvePoint *self, PyObject *value, void *UNUSE } static PyGetSetDef BPy_CurvePoint_getseters[] = { - {(char *)"first_svertex", + {"first_svertex", (getter)CurvePoint_first_svertex_get, (setter)CurvePoint_first_svertex_set, - (char *)CurvePoint_first_svertex_doc, + CurvePoint_first_svertex_doc, NULL}, - {(char *)"second_svertex", + {"second_svertex", (getter)CurvePoint_second_svertex_get, (setter)CurvePoint_second_svertex_set, - (char *)CurvePoint_second_svertex_doc, - NULL}, - {(char *)"fedge", (getter)CurvePoint_fedge_get, NULL, CurvePoint_fedge_doc, NULL}, - {(char *)"t2d", - (getter)CurvePoint_t2d_get, - (setter)CurvePoint_t2d_set, - (char *)CurvePoint_t2d_doc, + CurvePoint_second_svertex_doc, NULL}, + {"fedge", (getter)CurvePoint_fedge_get, NULL, CurvePoint_fedge_doc, NULL}, + {"t2d", (getter)CurvePoint_t2d_get, (setter)CurvePoint_t2d_set, CurvePoint_t2d_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp index 08ad378ab75..71a87c2c01e 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp @@ -424,37 +424,25 @@ static PyObject *SVertex_curvatures_get(BPy_SVertex *self, void *UNUSED(closure) } static PyGetSetDef BPy_SVertex_getseters[] = { - {(char *)"point_3d", + {"point_3d", (getter)SVertex_point_3d_get, (setter)SVertex_point_3d_set, - (char *)SVertex_point_3d_doc, + SVertex_point_3d_doc, NULL}, - {(char *)"point_2d", + {"point_2d", (getter)SVertex_point_2d_get, (setter)SVertex_point_2d_set, - (char *)SVertex_point_2d_doc, + SVertex_point_2d_doc, NULL}, - {(char *)"id", (getter)SVertex_id_get, (setter)SVertex_id_set, (char *)SVertex_id_doc, NULL}, - {(char *)"normals", - (getter)SVertex_normals_get, - (setter)NULL, - (char *)SVertex_normals_doc, - NULL}, - {(char *)"normals_size", + {"id", (getter)SVertex_id_get, (setter)SVertex_id_set, SVertex_id_doc, NULL}, + {"normals", (getter)SVertex_normals_get, (setter)NULL, SVertex_normals_doc, NULL}, + {"normals_size", (getter)SVertex_normals_size_get, (setter)NULL, - (char *)SVertex_normals_size_doc, - NULL}, - {(char *)"viewvertex", - (getter)SVertex_viewvertex_get, - (setter)NULL, - (char *)SVertex_viewvertex_doc, - NULL}, - {(char *)"curvatures", - (getter)SVertex_curvatures_get, - (setter)NULL, - (char *)SVertex_curvatures_doc, + SVertex_normals_size_doc, NULL}, + {"viewvertex", (getter)SVertex_viewvertex_get, (setter)NULL, SVertex_viewvertex_doc, NULL}, + {"curvatures", (getter)SVertex_curvatures_get, (setter)NULL, SVertex_curvatures_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp index 29bba040316..5ddb8a605ff 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp @@ -150,10 +150,10 @@ static int ViewVertex_nature_set(BPy_ViewVertex *self, PyObject *value, void *UN } static PyGetSetDef BPy_ViewVertex_getseters[] = { - {(char *)"nature", + {"nature", (getter)ViewVertex_nature_get, (setter)ViewVertex_nature_set, - (char *)ViewVertex_nature_doc, + ViewVertex_nature_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp index 74d8fe4ce60..07373c91726 100644 --- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp @@ -348,27 +348,27 @@ static PyObject *StrokeVertex_u_get(BPy_StrokeVertex *self, void *UNUSED(closure } static PyGetSetDef BPy_StrokeVertex_getseters[] = { - {(char *)"attribute", + {"attribute", (getter)StrokeVertex_attribute_get, (setter)StrokeVertex_attribute_set, - (char *)StrokeVertex_attribute_doc, + StrokeVertex_attribute_doc, NULL}, - {(char *)"curvilinear_abscissa", + {"curvilinear_abscissa", (getter)StrokeVertex_curvilinear_abscissa_get, (setter)StrokeVertex_curvilinear_abscissa_set, - (char *)StrokeVertex_curvilinear_abscissa_doc, + StrokeVertex_curvilinear_abscissa_doc, NULL}, - {(char *)"point", + {"point", (getter)StrokeVertex_point_get, (setter)StrokeVertex_point_set, - (char *)StrokeVertex_point_doc, + StrokeVertex_point_doc, NULL}, - {(char *)"stroke_length", + {"stroke_length", (getter)StrokeVertex_stroke_length_get, (setter)StrokeVertex_stroke_length_set, - (char *)StrokeVertex_stroke_length_doc, + StrokeVertex_stroke_length_doc, NULL}, - {(char *)"u", (getter)StrokeVertex_u_get, (setter)NULL, (char *)StrokeVertex_u_doc, NULL}, + {"u", (getter)StrokeVertex_u_get, (setter)NULL, StrokeVertex_u_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp index 315c0b16061..9295e4f424b 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp @@ -97,10 +97,10 @@ static int NonTVertex_svertex_set(BPy_NonTVertex *self, PyObject *value, void *U } static PyGetSetDef BPy_NonTVertex_getseters[] = { - {(char *)"svertex", + {"svertex", (getter)NonTVertex_svertex_get, (setter)NonTVertex_svertex_set, - (char *)NonTVertex_svertex_doc, + NonTVertex_svertex_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp index 7b23fdb04f1..8fa48e54b55 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp @@ -199,17 +199,17 @@ static int TVertex_id_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closu } static PyGetSetDef BPy_TVertex_getseters[] = { - {(char *)"front_svertex", + {"front_svertex", (getter)TVertex_front_svertex_get, (setter)TVertex_front_svertex_set, - (char *)TVertex_front_svertex_doc, + TVertex_front_svertex_doc, NULL}, - {(char *)"back_svertex", + {"back_svertex", (getter)TVertex_back_svertex_get, (setter)TVertex_back_svertex_set, - (char *)TVertex_back_svertex_doc, + TVertex_back_svertex_doc, NULL}, - {(char *)"id", (getter)TVertex_id_get, (setter)TVertex_id_set, (char *)TVertex_id_doc, NULL}, + {"id", (getter)TVertex_id_get, (setter)TVertex_id_set, TVertex_id_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp index 070e54c9305..adbf01cd777 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp @@ -323,42 +323,34 @@ static int FEdge_nature_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closu } static PyGetSetDef BPy_FEdge_getseters[] = { - {(char *)"first_svertex", + {"first_svertex", (getter)FEdge_first_svertex_get, (setter)FEdge_first_svertex_set, - (char *)FEdge_first_svertex_doc, + FEdge_first_svertex_doc, NULL}, - {(char *)"second_svertex", + {"second_svertex", (getter)FEdge_second_svertex_get, (setter)FEdge_second_svertex_set, - (char *)FEdge_second_svertex_doc, + FEdge_second_svertex_doc, NULL}, - {(char *)"next_fedge", + {"next_fedge", (getter)FEdge_next_fedge_get, (setter)FEdge_next_fedge_set, - (char *)FEdge_next_fedge_doc, + FEdge_next_fedge_doc, NULL}, - {(char *)"previous_fedge", + {"previous_fedge", (getter)FEdge_previous_fedge_get, (setter)FEdge_previous_fedge_set, - (char *)FEdge_previous_fedge_doc, + FEdge_previous_fedge_doc, NULL}, - {(char *)"viewedge", - (getter)FEdge_viewedge_get, - (setter)FEdge_viewedge_set, - (char *)FEdge_viewedge_doc, - NULL}, - {(char *)"is_smooth", + {"viewedge", (getter)FEdge_viewedge_get, (setter)FEdge_viewedge_set, FEdge_viewedge_doc, NULL}, + {"is_smooth", (getter)FEdge_is_smooth_get, (setter)FEdge_is_smooth_set, - (char *)FEdge_is_smooth_doc, - NULL}, - {(char *)"id", (getter)FEdge_id_get, (setter)FEdge_id_set, (char *)FEdge_id_doc, NULL}, - {(char *)"nature", - (getter)FEdge_nature_get, - (setter)FEdge_nature_set, - (char *)FEdge_nature_doc, + FEdge_is_smooth_doc, NULL}, + {"id", (getter)FEdge_id_get, (setter)FEdge_id_set, FEdge_id_doc, NULL}, + {"nature", (getter)FEdge_nature_get, (setter)FEdge_nature_set, FEdge_nature_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp index 932911fb6e6..fd434f9c4ef 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp @@ -180,15 +180,11 @@ static PyObject *FrsCurve_segments_size_get(BPy_FrsCurve *self, void *UNUSED(clo } static PyGetSetDef BPy_FrsCurve_getseters[] = { - {(char *)"is_empty", - (getter)FrsCurve_is_empty_get, - (setter)NULL, - (char *)FrsCurve_is_empty_doc, - NULL}, - {(char *)"segments_size", + {"is_empty", (getter)FrsCurve_is_empty_get, (setter)NULL, FrsCurve_is_empty_doc, NULL}, + {"segments_size", (getter)FrsCurve_segments_size_get, (setter)NULL, - (char *)FrsCurve_segments_size_doc, + FrsCurve_segments_size_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp index df80f61a7a6..444a69adf30 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp @@ -466,27 +466,23 @@ static int Stroke_id_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure } static PyGetSetDef BPy_Stroke_getseters[] = { - {(char *)"medium_type", + {"medium_type", (getter)Stroke_medium_type_get, (setter)Stroke_medium_type_set, - (char *)Stroke_medium_type_doc, + Stroke_medium_type_doc, NULL}, - {(char *)"texture_id", + {"texture_id", (getter)Stroke_texture_id_get, (setter)Stroke_texture_id_set, - (char *)Stroke_texture_id_doc, + Stroke_texture_id_doc, NULL}, - {(char *)"tips", - (getter)Stroke_tips_get, - (setter)Stroke_tips_set, - (char *)Stroke_tips_doc, - NULL}, - {(char *)"length_2d", + {"tips", (getter)Stroke_tips_get, (setter)Stroke_tips_set, Stroke_tips_doc, NULL}, + {"length_2d", (getter)Stroke_length_2d_get, (setter)Stroke_length_2d_set, - (char *)Stroke_length_2d_doc, + Stroke_length_2d_doc, NULL}, - {(char *)"id", (getter)Stroke_id_get, (setter)Stroke_id_set, (char *)Stroke_id_doc, NULL}, + {"id", (getter)Stroke_id_get, (setter)Stroke_id_set, Stroke_id_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp index 208d6cbfd6d..0570d9790ab 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp @@ -331,60 +331,48 @@ static int ViewEdge_chaining_time_stamp_set(BPy_ViewEdge *self, } static PyGetSetDef BPy_ViewEdge_getseters[] = { - {(char *)"first_viewvertex", + {"first_viewvertex", (getter)ViewEdge_first_viewvertex_get, (setter)ViewEdge_first_viewvertex_set, - (char *)ViewEdge_first_viewvertex_doc, + ViewEdge_first_viewvertex_doc, NULL}, - {(char *)"last_viewvertex", + {"last_viewvertex", (getter)ViewEdge_last_viewvertex_get, (setter)ViewEdge_last_viewvertex_set, - (char *)ViewEdge_last_viewvertex_doc, + ViewEdge_last_viewvertex_doc, NULL}, - {(char *)"first_fedge", + {"first_fedge", (getter)ViewEdge_first_fedge_get, (setter)ViewEdge_first_fedge_set, - (char *)ViewEdge_first_fedge_doc, + ViewEdge_first_fedge_doc, NULL}, - {(char *)"last_fedge", + {"last_fedge", (getter)ViewEdge_last_fedge_get, (setter)ViewEdge_last_fedge_set, - (char *)ViewEdge_last_fedge_doc, + ViewEdge_last_fedge_doc, NULL}, - {(char *)"viewshape", + {"viewshape", (getter)ViewEdge_viewshape_get, (setter)ViewEdge_viewshape_set, - (char *)ViewEdge_viewshape_doc, + ViewEdge_viewshape_doc, NULL}, - {(char *)"occludee", + {"occludee", (getter)ViewEdge_occludee_get, (setter)ViewEdge_occludee_set, - (char *)ViewEdge_occludee_doc, + ViewEdge_occludee_doc, NULL}, - {(char *)"is_closed", - (getter)ViewEdge_is_closed_get, - (setter)NULL, - (char *)ViewEdge_is_closed_doc, - NULL}, - {(char *)"id", - (getter)ViewEdge_id_get, - (setter)ViewEdge_id_set, - (char *)ViewEdge_id_doc, - NULL}, - {(char *)"nature", + {"is_closed", (getter)ViewEdge_is_closed_get, (setter)NULL, ViewEdge_is_closed_doc, NULL}, + {"id", (getter)ViewEdge_id_get, (setter)ViewEdge_id_set, ViewEdge_id_doc, NULL}, + {"nature", (getter)ViewEdge_nature_get, (setter)ViewEdge_nature_set, - (char *)ViewEdge_nature_doc, - NULL}, - {(char *)"qi", - (getter)ViewEdge_qi_get, - (setter)ViewEdge_qi_set, - (char *)ViewEdge_qi_doc, + ViewEdge_nature_doc, NULL}, - {(char *)"chaining_time_stamp", + {"qi", (getter)ViewEdge_qi_get, (setter)ViewEdge_qi_set, ViewEdge_qi_doc, NULL}, + {"chaining_time_stamp", (getter)ViewEdge_chaining_time_stamp_get, (setter)ViewEdge_chaining_time_stamp_set, - (char *)ViewEdge_chaining_time_stamp_doc, + ViewEdge_chaining_time_stamp_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp index 018d0c77bb0..725daa80b5e 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp @@ -364,45 +364,45 @@ static int FEdgeSharp_face_mark_left_set(BPy_FEdgeSharp *self, } static PyGetSetDef BPy_FEdgeSharp_getseters[] = { - {(char *)"normal_right", + {"normal_right", (getter)FEdgeSharp_normal_right_get, (setter)FEdgeSharp_normal_right_set, - (char *)FEdgeSharp_normal_right_doc, + FEdgeSharp_normal_right_doc, NULL}, - {(char *)"normal_left", + {"normal_left", (getter)FEdgeSharp_normal_left_get, (setter)FEdgeSharp_normal_left_set, - (char *)FEdgeSharp_normal_left_doc, + FEdgeSharp_normal_left_doc, NULL}, - {(char *)"material_index_right", + {"material_index_right", (getter)FEdgeSharp_material_index_right_get, (setter)FEdgeSharp_material_index_right_set, - (char *)FEdgeSharp_material_index_right_doc, + FEdgeSharp_material_index_right_doc, NULL}, - {(char *)"material_index_left", + {"material_index_left", (getter)FEdgeSharp_material_index_left_get, (setter)FEdgeSharp_material_index_left_set, - (char *)FEdgeSharp_material_index_left_doc, + FEdgeSharp_material_index_left_doc, NULL}, - {(char *)"material_right", + {"material_right", (getter)FEdgeSharp_material_right_get, (setter)NULL, - (char *)FEdgeSharp_material_right_doc, + FEdgeSharp_material_right_doc, NULL}, - {(char *)"material_left", + {"material_left", (getter)FEdgeSharp_material_left_get, (setter)NULL, - (char *)FEdgeSharp_material_left_doc, + FEdgeSharp_material_left_doc, NULL}, - {(char *)"face_mark_right", + {"face_mark_right", (getter)FEdgeSharp_face_mark_right_get, (setter)FEdgeSharp_face_mark_right_set, - (char *)FEdgeSharp_face_mark_right_doc, + FEdgeSharp_face_mark_right_doc, NULL}, - {(char *)"face_mark_left", + {"face_mark_left", (getter)FEdgeSharp_face_mark_left_get, (setter)FEdgeSharp_face_mark_left_set, - (char *)FEdgeSharp_face_mark_left_doc, + FEdgeSharp_face_mark_left_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp index 4c2785509f0..65d9dcbe01f 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp @@ -229,25 +229,21 @@ static int FEdgeSmooth_face_mark_set(BPy_FEdgeSmooth *self, PyObject *value, voi } static PyGetSetDef BPy_FEdgeSmooth_getseters[] = { - {(char *)"normal", + {"normal", (getter)FEdgeSmooth_normal_get, (setter)FEdgeSmooth_normal_set, - (char *)FEdgeSmooth_normal_doc, + FEdgeSmooth_normal_doc, NULL}, - {(char *)"material_index", + {"material_index", (getter)FEdgeSmooth_material_index_get, (setter)FEdgeSmooth_material_index_set, - (char *)FEdgeSmooth_material_index_doc, + FEdgeSmooth_material_index_doc, NULL}, - {(char *)"material", - (getter)FEdgeSmooth_material_get, - (setter)NULL, - (char *)FEdgeSmooth_material_doc, - NULL}, - {(char *)"face_mark", + {"material", (getter)FEdgeSmooth_material_get, (setter)NULL, FEdgeSmooth_material_doc, NULL}, + {"face_mark", (getter)FEdgeSmooth_face_mark_get, (setter)FEdgeSmooth_face_mark_set, - (char *)FEdgeSmooth_face_mark_doc, + FEdgeSmooth_face_mark_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp index 4264e96afc3..74ae7809284 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp @@ -172,15 +172,15 @@ static PyObject *AdjacencyIterator_is_incoming_get(BPy_AdjacencyIterator *self, } static PyGetSetDef BPy_AdjacencyIterator_getseters[] = { - {(char *)"is_incoming", + {"is_incoming", (getter)AdjacencyIterator_is_incoming_get, (setter)NULL, - (char *)AdjacencyIterator_is_incoming_doc, + AdjacencyIterator_is_incoming_doc, NULL}, - {(char *)"object", + {"object", (getter)AdjacencyIterator_object_get, (setter)NULL, - (char *)AdjacencyIterator_object_doc, + AdjacencyIterator_object_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp index b2042107453..b6d841c5b64 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp @@ -234,20 +234,20 @@ static PyObject *ChainingIterator_is_incrementing_get(BPy_ChainingIterator *self } static PyGetSetDef BPy_ChainingIterator_getseters[] = { - {(char *)"object", + {"object", (getter)ChainingIterator_object_get, (setter)NULL, - (char *)ChainingIterator_object_doc, + ChainingIterator_object_doc, NULL}, - {(char *)"next_vertex", + {"next_vertex", (getter)ChainingIterator_next_vertex_get, (setter)NULL, - (char *)ChainingIterator_next_vertex_doc, + ChainingIterator_next_vertex_doc, NULL}, - {(char *)"is_incrementing", + {"is_incrementing", (getter)ChainingIterator_is_incrementing_get, (setter)NULL, - (char *)ChainingIterator_is_incrementing_doc, + ChainingIterator_is_incrementing_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp index abc10b75ea1..6ea61a060cb 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp @@ -123,21 +123,13 @@ static PyObject *CurvePointIterator_u_get(BPy_CurvePointIterator *self, void *UN } static PyGetSetDef BPy_CurvePointIterator_getseters[] = { - {(char *)"object", + {"object", (getter)CurvePointIterator_object_get, (setter)NULL, - (char *)CurvePointIterator_object_doc, - NULL}, - {(char *)"t", - (getter)CurvePointIterator_t_get, - (setter)NULL, - (char *)CurvePointIterator_t_doc, - NULL}, - {(char *)"u", - (getter)CurvePointIterator_u_get, - (setter)NULL, - (char *)CurvePointIterator_u_doc, + CurvePointIterator_object_doc, NULL}, + {"t", (getter)CurvePointIterator_t_get, (setter)NULL, CurvePointIterator_t_doc, NULL}, + {"u", (getter)CurvePointIterator_u_get, (setter)NULL, CurvePointIterator_u_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp index 8428badc0fd..0dbef9f325c 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp @@ -192,25 +192,17 @@ static PyObject *Interface0DIterator_at_last_get(BPy_Interface0DIterator *self, } static PyGetSetDef BPy_Interface0DIterator_getseters[] = { - {(char *)"object", + {"object", (getter)Interface0DIterator_object_get, (setter)NULL, - (char *)Interface0DIterator_object_doc, + Interface0DIterator_object_doc, NULL}, - {(char *)"t", - (getter)Interface0DIterator_t_get, - (setter)NULL, - (char *)Interface0DIterator_t_doc, - NULL}, - {(char *)"u", - (getter)Interface0DIterator_u_get, - (setter)NULL, - (char *)Interface0DIterator_u_doc, - NULL}, - {(char *)"at_last", + {"t", (getter)Interface0DIterator_t_get, (setter)NULL, Interface0DIterator_t_doc, NULL}, + {"u", (getter)Interface0DIterator_u_get, (setter)NULL, Interface0DIterator_u_doc, NULL}, + {"at_last", (getter)Interface0DIterator_at_last_get, (setter)NULL, - (char *)Interface0DIterator_at_last_doc, + Interface0DIterator_at_last_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp index 260776e8965..dd738b97473 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp @@ -151,21 +151,9 @@ static PyObject *SVertexIterator_u_get(BPy_SVertexIterator *self, void *UNUSED(c } static PyGetSetDef BPy_SVertexIterator_getseters[] = { - {(char *)"object", - (getter)SVertexIterator_object_get, - (setter)NULL, - (char *)SVertexIterator_object_doc, - NULL}, - {(char *)"t", - (getter)SVertexIterator_t_get, - (setter)NULL, - (char *)SVertexIterator_t_doc, - NULL}, - {(char *)"u", - (getter)SVertexIterator_u_get, - (setter)NULL, - (char *)SVertexIterator_u_doc, - NULL}, + {"object", (getter)SVertexIterator_object_get, (setter)NULL, SVertexIterator_object_doc, NULL}, + {"t", (getter)SVertexIterator_t_get, (setter)NULL, SVertexIterator_t_doc, NULL}, + {"u", (getter)SVertexIterator_u_get, (setter)NULL, SVertexIterator_u_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp index 4269dfb3cdd..84f57f1fe31 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp @@ -265,25 +265,17 @@ static PyObject *StrokeVertexIterator_at_last_get(BPy_StrokeVertexIterator *self } static PyGetSetDef BPy_StrokeVertexIterator_getseters[] = { - {(char *)"object", + {"object", (getter)StrokeVertexIterator_object_get, (setter)NULL, - (char *)StrokeVertexIterator_object_doc, + StrokeVertexIterator_object_doc, NULL}, - {(char *)"t", - (getter)StrokeVertexIterator_t_get, - (setter)NULL, - (char *)StrokeVertexIterator_t_doc, - NULL}, - {(char *)"u", - (getter)StrokeVertexIterator_u_get, - (setter)NULL, - (char *)StrokeVertexIterator_u_doc, - NULL}, - {(char *)"at_last", + {"t", (getter)StrokeVertexIterator_t_get, (setter)NULL, StrokeVertexIterator_t_doc, NULL}, + {"u", (getter)StrokeVertexIterator_u_get, (setter)NULL, StrokeVertexIterator_u_doc, NULL}, + {"at_last", (getter)StrokeVertexIterator_at_last_get, (setter)NULL, - (char *)StrokeVertexIterator_at_last_doc, + StrokeVertexIterator_at_last_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp index df56cbe822e..c8a978784a4 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp @@ -214,25 +214,25 @@ static int ViewEdgeIterator_begin_set(BPy_ViewEdgeIterator *self, } static PyGetSetDef BPy_ViewEdgeIterator_getseters[] = { - {(char *)"object", + {"object", (getter)ViewEdgeIterator_object_get, (setter)NULL, - (char *)ViewEdgeIterator_object_doc, + ViewEdgeIterator_object_doc, NULL}, - {(char *)"current_edge", + {"current_edge", (getter)ViewEdgeIterator_current_edge_get, (setter)ViewEdgeIterator_current_edge_set, - (char *)ViewEdgeIterator_current_edge_doc, + ViewEdgeIterator_current_edge_doc, NULL}, - {(char *)"orientation", + {"orientation", (getter)ViewEdgeIterator_orientation_get, (setter)ViewEdgeIterator_orientation_set, - (char *)ViewEdgeIterator_orientation_doc, + ViewEdgeIterator_orientation_doc, NULL}, - {(char *)"begin", + {"begin", (getter)ViewEdgeIterator_begin_get, (setter)ViewEdgeIterator_begin_set, - (char *)ViewEdgeIterator_begin_doc, + ViewEdgeIterator_begin_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp index 821a92184d1..fe6210468d1 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp @@ -131,10 +131,10 @@ static PyObject *orientedViewEdgeIterator_object_get(BPy_orientedViewEdgeIterato } static PyGetSetDef BPy_orientedViewEdgeIterator_getseters[] = { - {(char *)"object", + {"object", (getter)orientedViewEdgeIterator_object_get, (setter)NULL, - (char *)orientedViewEdgeIterator_object_doc, + orientedViewEdgeIterator_object_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp index bed2d5d578a..543375fa85b 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp @@ -258,10 +258,10 @@ static int integration_type_set(BPy_UnaryFunction1DDouble *self, } static PyGetSetDef BPy_UnaryFunction1DDouble_getseters[] = { - {(char *)"integration_type", + {"integration_type", (getter)integration_type_get, (setter)integration_type_set, - (char *)integration_type_doc, + integration_type_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp index e122454c00d..fcc72cf7b71 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp @@ -165,10 +165,10 @@ static int integration_type_set(BPy_UnaryFunction1DEdgeNature *self, } static PyGetSetDef BPy_UnaryFunction1DEdgeNature_getseters[] = { - {(char *)"integration_type", + {"integration_type", (getter)integration_type_get, (setter)integration_type_set, - (char *)integration_type_doc, + integration_type_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp index 95d49612672..ef4de9a77dc 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp @@ -154,10 +154,10 @@ static int integration_type_set(BPy_UnaryFunction1DFloat *self, } static PyGetSetDef BPy_UnaryFunction1DFloat_getseters[] = { - {(char *)"integration_type", + {"integration_type", (getter)integration_type_get, (setter)integration_type_set, - (char *)integration_type_doc, + integration_type_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp index 851fc45d583..5be9e2dee28 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp @@ -165,10 +165,10 @@ static int integration_type_set(BPy_UnaryFunction1DUnsigned *self, } static PyGetSetDef BPy_UnaryFunction1DUnsigned_getseters[] = { - {(char *)"integration_type", + {"integration_type", (getter)integration_type_get, (setter)integration_type_set, - (char *)integration_type_doc, + integration_type_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp index 75225fd6381..58ab705e8c1 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp @@ -169,10 +169,10 @@ static int integration_type_set(BPy_UnaryFunction1DVec2f *self, } static PyGetSetDef BPy_UnaryFunction1DVec2f_getseters[] = { - {(char *)"integration_type", + {"integration_type", (getter)integration_type_get, (setter)integration_type_set, - (char *)integration_type_doc, + integration_type_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp index a2767e826ab..e1f64e7cd82 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp @@ -162,10 +162,10 @@ static int integration_type_set(BPy_UnaryFunction1DVec3f *self, } static PyGetSetDef BPy_UnaryFunction1DVec3f_getseters[] = { - {(char *)"integration_type", + {"integration_type", (getter)integration_type_get, (setter)integration_type_set, - (char *)integration_type_doc, + integration_type_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp index 0739f327f55..12b985bc707 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp @@ -190,10 +190,10 @@ static int integration_type_set(BPy_UnaryFunction1DVectorViewShape *self, } static PyGetSetDef BPy_UnaryFunction1DVectorViewShape_getseters[] = { - {(char *)"integration_type", + {"integration_type", (getter)integration_type_get, (setter)integration_type_set, - (char *)integration_type_doc, + integration_type_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp index ca1e35f66bd..3b55a20939e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp @@ -177,10 +177,10 @@ static int integration_type_set(BPy_UnaryFunction1DVoid *self, } static PyGetSetDef BPy_UnaryFunction1DVoid_getseters[] = { - {(char *)"integration_type", + {"integration_type", (getter)integration_type_get, (setter)integration_type_set, - (char *)integration_type_doc, + integration_type_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/bmesh/bmesh_py_ops.c b/source/blender/python/bmesh/bmesh_py_ops.c index b6ba119f695..a3bfe791c88 100644 --- a/source/blender/python/bmesh/bmesh_py_ops.c +++ b/source/blender/python/bmesh/bmesh_py_ops.c @@ -154,7 +154,7 @@ static PyObject *bpy_bmesh_op_doc_get(BPy_BMeshOpFunc *self, void *UNUSED(closur } static PyGetSetDef bpy_bmesh_op_getseters[] = { - {(char *)"__doc__", (getter)bpy_bmesh_op_doc_get, (setter)NULL, NULL, NULL}, + {"__doc__", (getter)bpy_bmesh_op_doc_get, (setter)NULL, NULL, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index b601a35f7f2..73107ebc16c 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -613,264 +613,232 @@ static int bpy_bmfaceseq_active_set(BPy_BMElem *self, PyObject *value, void *UNU } static PyGetSetDef bpy_bmesh_getseters[] = { - {(char *)"verts", (getter)bpy_bmvertseq_get, (setter)NULL, (char *)bpy_bmvertseq_doc, NULL}, - {(char *)"edges", (getter)bpy_bmedgeseq_get, (setter)NULL, (char *)bpy_bmedgeseq_doc, NULL}, - {(char *)"faces", (getter)bpy_bmfaceseq_get, (setter)NULL, (char *)bpy_bmfaceseq_doc, NULL}, - {(char *)"loops", (getter)bpy_bmloopseq_get, (setter)NULL, (char *)bpy_bmloopseq_doc, NULL}, - {(char *)"select_mode", + {"verts", (getter)bpy_bmvertseq_get, (setter)NULL, bpy_bmvertseq_doc, NULL}, + {"edges", (getter)bpy_bmedgeseq_get, (setter)NULL, bpy_bmedgeseq_doc, NULL}, + {"faces", (getter)bpy_bmfaceseq_get, (setter)NULL, bpy_bmfaceseq_doc, NULL}, + {"loops", (getter)bpy_bmloopseq_get, (setter)NULL, bpy_bmloopseq_doc, NULL}, + {"select_mode", (getter)bpy_bmesh_select_mode_get, (setter)bpy_bmesh_select_mode_set, - (char *)bpy_bmesh_select_mode_doc, + bpy_bmesh_select_mode_doc, NULL}, - {(char *)"select_history", + {"select_history", (getter)bpy_bmesh_select_history_get, (setter)bpy_bmesh_select_history_set, - (char *)bpy_bmesh_select_history_doc, + bpy_bmesh_select_history_doc, NULL}, /* readonly checks */ - {(char *)"is_wrapped", + {"is_wrapped", (getter)bpy_bmesh_is_wrapped_get, (setter)NULL, - (char *)bpy_bmesh_is_wrapped_doc, + bpy_bmesh_is_wrapped_doc, NULL}, /* as with mathutils */ - {(char *)"is_valid", - (getter)bpy_bm_is_valid_get, - (setter)NULL, - (char *)bpy_bm_is_valid_doc, - NULL}, + {"is_valid", (getter)bpy_bm_is_valid_get, (setter)NULL, bpy_bm_is_valid_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; static PyGetSetDef bpy_bmvert_getseters[] = { /* generic */ - {(char *)"select", + {"select", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_select_doc, + bpy_bm_elem_select_doc, (void *)BM_ELEM_SELECT}, - {(char *)"hide", + {"hide", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_hide_doc, + bpy_bm_elem_hide_doc, (void *)BM_ELEM_HIDDEN}, - {(char *)"tag", + {"tag", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_tag_doc, + bpy_bm_elem_tag_doc, (void *)BM_ELEM_TAG}, - {(char *)"index", + {"index", (getter)bpy_bm_elem_index_get, (setter)bpy_bm_elem_index_set, - (char *)bpy_bm_elem_index_doc, + bpy_bm_elem_index_doc, NULL}, - {(char *)"co", - (getter)bpy_bmvert_co_get, - (setter)bpy_bmvert_co_set, - (char *)bpy_bmvert_co_doc, - NULL}, - {(char *)"normal", + {"co", (getter)bpy_bmvert_co_get, (setter)bpy_bmvert_co_set, bpy_bmvert_co_doc, NULL}, + {"normal", (getter)bpy_bmvert_normal_get, (setter)bpy_bmvert_normal_set, - (char *)bpy_bmvert_normal_doc, + bpy_bmvert_normal_doc, NULL}, /* connectivity data */ - {(char *)"link_edges", + {"link_edges", (getter)bpy_bmelemseq_elem_get, (setter)NULL, - (char *)bpy_bmvert_link_edges_doc, + bpy_bmvert_link_edges_doc, (void *)BM_EDGES_OF_VERT}, - {(char *)"link_faces", + {"link_faces", (getter)bpy_bmelemseq_elem_get, (setter)NULL, - (char *)bpy_bmvert_link_faces_doc, + bpy_bmvert_link_faces_doc, (void *)BM_FACES_OF_VERT}, - {(char *)"link_loops", + {"link_loops", (getter)bpy_bmelemseq_elem_get, (setter)NULL, - (char *)bpy_bmvert_link_loops_doc, + bpy_bmvert_link_loops_doc, (void *)BM_LOOPS_OF_VERT}, /* readonly checks */ - {(char *)"is_manifold", + {"is_manifold", (getter)bpy_bmvert_is_manifold_get, (setter)NULL, - (char *)bpy_bmvert_is_manifold_doc, - NULL}, - {(char *)"is_wire", - (getter)bpy_bmvert_is_wire_get, - (setter)NULL, - (char *)bpy_bmvert_is_wire_doc, + bpy_bmvert_is_manifold_doc, NULL}, - {(char *)"is_boundary", + {"is_wire", (getter)bpy_bmvert_is_wire_get, (setter)NULL, bpy_bmvert_is_wire_doc, NULL}, + {"is_boundary", (getter)bpy_bmvert_is_boundary_get, (setter)NULL, - (char *)bpy_bmvert_is_boundary_doc, - NULL}, - {(char *)"is_valid", - (getter)bpy_bm_is_valid_get, - (setter)NULL, - (char *)bpy_bm_is_valid_doc, + bpy_bmvert_is_boundary_doc, NULL}, + {"is_valid", (getter)bpy_bm_is_valid_get, (setter)NULL, bpy_bm_is_valid_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; static PyGetSetDef bpy_bmedge_getseters[] = { /* generic */ - {(char *)"select", + {"select", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_select_doc, + bpy_bm_elem_select_doc, (void *)BM_ELEM_SELECT}, - {(char *)"hide", + {"hide", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_hide_doc, + bpy_bm_elem_hide_doc, (void *)BM_ELEM_HIDDEN}, - {(char *)"tag", + {"tag", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_tag_doc, + bpy_bm_elem_tag_doc, (void *)BM_ELEM_TAG}, - {(char *)"index", + {"index", (getter)bpy_bm_elem_index_get, (setter)bpy_bm_elem_index_set, - (char *)bpy_bm_elem_index_doc, + bpy_bm_elem_index_doc, NULL}, - {(char *)"smooth", + {"smooth", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_smooth_doc, + bpy_bm_elem_smooth_doc, (void *)BM_ELEM_SMOOTH}, - {(char *)"seam", + {"seam", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_seam_doc, + bpy_bm_elem_seam_doc, (void *)BM_ELEM_SEAM}, /* connectivity data */ - {(char *)"verts", + {"verts", (getter)bpy_bmelemseq_elem_get, (setter)NULL, - (char *)bpy_bmedge_verts_doc, + bpy_bmedge_verts_doc, (void *)BM_VERTS_OF_EDGE}, - {(char *)"link_faces", + {"link_faces", (getter)bpy_bmelemseq_elem_get, (setter)NULL, - (char *)bpy_bmedge_link_faces_doc, + bpy_bmedge_link_faces_doc, (void *)BM_FACES_OF_EDGE}, - {(char *)"link_loops", + {"link_loops", (getter)bpy_bmelemseq_elem_get, (setter)NULL, - (char *)bpy_bmedge_link_loops_doc, + bpy_bmedge_link_loops_doc, (void *)BM_LOOPS_OF_EDGE}, /* readonly checks */ - {(char *)"is_manifold", + {"is_manifold", (getter)bpy_bmedge_is_manifold_get, (setter)NULL, - (char *)bpy_bmedge_is_manifold_doc, + bpy_bmedge_is_manifold_doc, NULL}, - {(char *)"is_contiguous", + {"is_contiguous", (getter)bpy_bmedge_is_contiguous_get, (setter)NULL, - (char *)bpy_bmedge_is_contiguous_doc, + bpy_bmedge_is_contiguous_doc, NULL}, - {(char *)"is_convex", - (getter)bpy_bmedge_is_convex_get, - (setter)NULL, - (char *)bpy_bmedge_is_convex_doc, - NULL}, - {(char *)"is_wire", - (getter)bpy_bmedge_is_wire_get, - (setter)NULL, - (char *)bpy_bmedge_is_wire_doc, - NULL}, - {(char *)"is_boundary", + {"is_convex", (getter)bpy_bmedge_is_convex_get, (setter)NULL, bpy_bmedge_is_convex_doc, NULL}, + {"is_wire", (getter)bpy_bmedge_is_wire_get, (setter)NULL, bpy_bmedge_is_wire_doc, NULL}, + {"is_boundary", (getter)bpy_bmedge_is_boundary_get, (setter)NULL, - (char *)bpy_bmedge_is_boundary_doc, - NULL}, - {(char *)"is_valid", - (getter)bpy_bm_is_valid_get, - (setter)NULL, - (char *)bpy_bm_is_valid_doc, + bpy_bmedge_is_boundary_doc, NULL}, + {"is_valid", (getter)bpy_bm_is_valid_get, (setter)NULL, bpy_bm_is_valid_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; static PyGetSetDef bpy_bmface_getseters[] = { /* generic */ - {(char *)"select", + {"select", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_select_doc, + bpy_bm_elem_select_doc, (void *)BM_ELEM_SELECT}, - {(char *)"hide", + {"hide", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_hide_doc, + bpy_bm_elem_hide_doc, (void *)BM_ELEM_HIDDEN}, - {(char *)"tag", + {"tag", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_tag_doc, + bpy_bm_elem_tag_doc, (void *)BM_ELEM_TAG}, - {(char *)"index", + {"index", (getter)bpy_bm_elem_index_get, (setter)bpy_bm_elem_index_set, - (char *)bpy_bm_elem_index_doc, + bpy_bm_elem_index_doc, NULL}, - {(char *)"smooth", + {"smooth", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_smooth_doc, + bpy_bm_elem_smooth_doc, (void *)BM_ELEM_SMOOTH}, - {(char *)"normal", + {"normal", (getter)bpy_bmface_normal_get, (setter)bpy_bmface_normal_set, - (char *)bpy_bmface_normal_doc, + bpy_bmface_normal_doc, NULL}, - {(char *)"material_index", + {"material_index", (getter)bpy_bmface_material_index_get, (setter)bpy_bmface_material_index_set, - (char *)bpy_bmface_material_index_doc, + bpy_bmface_material_index_doc, NULL}, /* connectivity data */ - {(char *)"verts", + {"verts", (getter)bpy_bmelemseq_elem_get, (setter)NULL, - (char *)bpy_bmface_verts_doc, + bpy_bmface_verts_doc, (void *)BM_VERTS_OF_FACE}, - {(char *)"edges", + {"edges", (getter)bpy_bmelemseq_elem_get, (setter)NULL, - (char *)bpy_bmface_edges_doc, + bpy_bmface_edges_doc, (void *)BM_EDGES_OF_FACE}, - {(char *)"loops", + {"loops", (getter)bpy_bmelemseq_elem_get, (setter)NULL, - (char *)bpy_bmface_loops_doc, + bpy_bmface_loops_doc, (void *)BM_LOOPS_OF_FACE}, /* readonly checks */ - {(char *)"is_valid", - (getter)bpy_bm_is_valid_get, - (setter)NULL, - (char *)bpy_bm_is_valid_doc, - NULL}, + {"is_valid", (getter)bpy_bm_is_valid_get, (setter)NULL, bpy_bm_is_valid_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; @@ -879,109 +847,101 @@ static PyGetSetDef bpy_bmloop_getseters[] = { /* generic */ /* flags are available but not used for loops. */ #if 0 - {(char *)"select", + {"select", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_select_doc, + bpy_bm_elem_select_doc, (void *)BM_ELEM_SELECT}, - {(char *)"hide", + {"hide", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_hide_doc, + bpy_bm_elem_hide_doc, (void *)BM_ELEM_HIDDEN}, #endif - {(char *)"tag", + {"tag", (getter)bpy_bm_elem_hflag_get, (setter)bpy_bm_elem_hflag_set, - (char *)bpy_bm_elem_tag_doc, + bpy_bm_elem_tag_doc, (void *)BM_ELEM_TAG}, - {(char *)"index", + {"index", (getter)bpy_bm_elem_index_get, (setter)bpy_bm_elem_index_set, - (char *)bpy_bm_elem_index_doc, + bpy_bm_elem_index_doc, NULL}, - {(char *)"vert", (getter)bpy_bmloop_vert_get, (setter)NULL, (char *)bpy_bmloop_vert_doc, NULL}, - {(char *)"edge", (getter)bpy_bmloop_edge_get, (setter)NULL, (char *)bpy_bmloop_edge_doc, NULL}, - {(char *)"face", (getter)bpy_bmloop_face_get, (setter)NULL, (char *)bpy_bmloop_face_doc, NULL}, + {"vert", (getter)bpy_bmloop_vert_get, (setter)NULL, bpy_bmloop_vert_doc, NULL}, + {"edge", (getter)bpy_bmloop_edge_get, (setter)NULL, bpy_bmloop_edge_doc, NULL}, + {"face", (getter)bpy_bmloop_face_get, (setter)NULL, bpy_bmloop_face_doc, NULL}, /* connectivity data */ - {(char *)"link_loops", + {"link_loops", (getter)bpy_bmelemseq_elem_get, (setter)NULL, - (char *)bpy_bmloops_link_loops_doc, + bpy_bmloops_link_loops_doc, (void *)BM_LOOPS_OF_LOOP}, - {(char *)"link_loop_next", + {"link_loop_next", (getter)bpy_bmloop_link_loop_next_get, (setter)NULL, - (char *)bpy_bmloop_link_loop_next_doc, + bpy_bmloop_link_loop_next_doc, NULL}, - {(char *)"link_loop_prev", + {"link_loop_prev", (getter)bpy_bmloop_link_loop_prev_get, (setter)NULL, - (char *)bpy_bmloop_link_loop_prev_doc, + bpy_bmloop_link_loop_prev_doc, NULL}, - {(char *)"link_loop_radial_next", + {"link_loop_radial_next", (getter)bpy_bmloop_link_loop_radial_next_get, (setter)NULL, - (char *)bpy_bmloop_link_loop_radial_next_doc, + bpy_bmloop_link_loop_radial_next_doc, NULL}, - {(char *)"link_loop_radial_prev", + {"link_loop_radial_prev", (getter)bpy_bmloop_link_loop_radial_prev_get, (setter)NULL, - (char *)bpy_bmloop_link_loop_radial_prev_doc, + bpy_bmloop_link_loop_radial_prev_doc, NULL}, /* readonly checks */ - {(char *)"is_convex", - (getter)bpy_bmloop_is_convex_get, - (setter)NULL, - (char *)bpy_bmloop_is_convex_doc, - NULL}, - {(char *)"is_valid", - (getter)bpy_bm_is_valid_get, - (setter)NULL, - (char *)bpy_bm_is_valid_doc, - NULL}, + {"is_convex", (getter)bpy_bmloop_is_convex_get, (setter)NULL, bpy_bmloop_is_convex_doc, NULL}, + {"is_valid", (getter)bpy_bm_is_valid_get, (setter)NULL, bpy_bm_is_valid_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; static PyGetSetDef bpy_bmvertseq_getseters[] = { - {(char *)"layers", + {"layers", (getter)bpy_bmelemseq_layers_get, (setter)NULL, - (char *)bpy_bmelemseq_layers_vert_doc, + bpy_bmelemseq_layers_vert_doc, (void *)BM_VERT}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; static PyGetSetDef bpy_bmedgeseq_getseters[] = { - {(char *)"layers", + {"layers", (getter)bpy_bmelemseq_layers_get, (setter)NULL, - (char *)bpy_bmelemseq_layers_edge_doc, + bpy_bmelemseq_layers_edge_doc, (void *)BM_EDGE}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; static PyGetSetDef bpy_bmfaceseq_getseters[] = { - {(char *)"layers", + {"layers", (getter)bpy_bmelemseq_layers_get, (setter)NULL, - (char *)bpy_bmelemseq_layers_face_doc, + bpy_bmelemseq_layers_face_doc, (void *)BM_FACE}, /* face only */ - {(char *)"active", + {"active", (getter)bpy_bmfaceseq_active_get, (setter)bpy_bmfaceseq_active_set, - (char *)bpy_bmfaceseq_active_doc, + bpy_bmfaceseq_active_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; static PyGetSetDef bpy_bmloopseq_getseters[] = { - {(char *)"layers", + {"layers", (getter)bpy_bmelemseq_layers_get, (setter)NULL, - (char *)bpy_bmelemseq_layers_loop_doc, + bpy_bmelemseq_layers_loop_doc, (void *)BM_LOOP}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c index a7f4e30b494..ce700849cf3 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c @@ -174,84 +174,84 @@ static PyObject *bpy_bmlayeritem_name_get(BPy_BMLayerItem *self, void *UNUSED(fl } static PyGetSetDef bpy_bmlayeraccess_vert_getseters[] = { - {(char *)"deform", + {"deform", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__deform_doc, + bpy_bmlayeraccess_collection__deform_doc, (void *)CD_MDEFORMVERT}, - {(char *)"float", + {"float", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__float_doc, + bpy_bmlayeraccess_collection__float_doc, (void *)CD_PROP_FLT}, - {(char *)"int", + {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__int_doc, + bpy_bmlayeraccess_collection__int_doc, (void *)CD_PROP_INT}, - {(char *)"string", + {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__string_doc, + bpy_bmlayeraccess_collection__string_doc, (void *)CD_PROP_STR}, - {(char *)"shape", + {"shape", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__shape_doc, + bpy_bmlayeraccess_collection__shape_doc, (void *)CD_SHAPEKEY}, - {(char *)"bevel_weight", + {"bevel_weight", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__bevel_weight_doc, + bpy_bmlayeraccess_collection__bevel_weight_doc, (void *)CD_BWEIGHT}, - {(char *)"skin", + {"skin", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__skin_doc, + bpy_bmlayeraccess_collection__skin_doc, (void *)CD_MVERT_SKIN}, - {(char *)"paint_mask", + {"paint_mask", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__paint_mask_doc, + bpy_bmlayeraccess_collection__paint_mask_doc, (void *)CD_PAINT_MASK}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; static PyGetSetDef bpy_bmlayeraccess_edge_getseters[] = { - {(char *)"float", + {"float", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__float_doc, + bpy_bmlayeraccess_collection__float_doc, (void *)CD_PROP_FLT}, - {(char *)"int", + {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__int_doc, + bpy_bmlayeraccess_collection__int_doc, (void *)CD_PROP_INT}, - {(char *)"string", + {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__string_doc, + bpy_bmlayeraccess_collection__string_doc, (void *)CD_PROP_STR}, - {(char *)"bevel_weight", + {"bevel_weight", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__bevel_weight_doc, + bpy_bmlayeraccess_collection__bevel_weight_doc, (void *)CD_BWEIGHT}, - {(char *)"crease", + {"crease", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__crease_doc, + bpy_bmlayeraccess_collection__crease_doc, (void *)CD_CREASE}, #ifdef WITH_FREESTYLE - {(char *)"freestyle", + {"freestyle", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__freestyle_edge_doc, + bpy_bmlayeraccess_collection__freestyle_edge_doc, (void *)CD_FREESTYLE_EDGE}, #endif @@ -259,32 +259,32 @@ static PyGetSetDef bpy_bmlayeraccess_edge_getseters[] = { }; static PyGetSetDef bpy_bmlayeraccess_face_getseters[] = { - {(char *)"float", + {"float", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__float_doc, + bpy_bmlayeraccess_collection__float_doc, (void *)CD_PROP_FLT}, - {(char *)"int", + {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__int_doc, + bpy_bmlayeraccess_collection__int_doc, (void *)CD_PROP_INT}, - {(char *)"string", + {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__string_doc, + bpy_bmlayeraccess_collection__string_doc, (void *)CD_PROP_STR}, - {(char *)"face_map", + {"face_map", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__face_map_doc, + bpy_bmlayeraccess_collection__face_map_doc, (void *)CD_FACEMAP}, #ifdef WITH_FREESTYLE - {(char *)"freestyle", + {"freestyle", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__freestyle_face_doc, + bpy_bmlayeraccess_collection__freestyle_face_doc, (void *)CD_FREESTYLE_FACE}, #endif @@ -292,31 +292,31 @@ static PyGetSetDef bpy_bmlayeraccess_face_getseters[] = { }; static PyGetSetDef bpy_bmlayeraccess_loop_getseters[] = { - {(char *)"float", + {"float", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__float_doc, + bpy_bmlayeraccess_collection__float_doc, (void *)CD_PROP_FLT}, - {(char *)"int", + {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__int_doc, + bpy_bmlayeraccess_collection__int_doc, (void *)CD_PROP_INT}, - {(char *)"string", + {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__string_doc, + bpy_bmlayeraccess_collection__string_doc, (void *)CD_PROP_STR}, - {(char *)"uv", + {"uv", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__uv_doc, + bpy_bmlayeraccess_collection__uv_doc, (void *)CD_MLOOPUV}, - {(char *)"color", + {"color", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, - (char *)bpy_bmlayeraccess_collection__color_doc, + bpy_bmlayeraccess_collection__color_doc, (void *)CD_MLOOPCOL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ @@ -324,15 +324,15 @@ static PyGetSetDef bpy_bmlayeraccess_loop_getseters[] = { static PyGetSetDef bpy_bmlayercollection_getseters[] = { /* BMESH_TODO, make writeable */ - {(char *)"active", + {"active", (getter)bpy_bmlayercollection_active_get, (setter)NULL, - (char *)bpy_bmlayercollection_active_doc, + bpy_bmlayercollection_active_doc, NULL}, - {(char *)"is_singleton", + {"is_singleton", (getter)bpy_bmlayercollection_is_singleton_get, (setter)NULL, - (char *)bpy_bmlayercollection_is_singleton_doc, + bpy_bmlayercollection_is_singleton_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ @@ -340,11 +340,7 @@ static PyGetSetDef bpy_bmlayercollection_getseters[] = { static PyGetSetDef bpy_bmlayeritem_getseters[] = { /* BMESH_TODO, make writeable */ - {(char *)"name", - (getter)bpy_bmlayeritem_name_get, - (setter)NULL, - (char *)bpy_bmlayercollection_name_doc, - NULL}, + {"name", (getter)bpy_bmlayeritem_name_get, (setter)NULL, bpy_bmlayercollection_name_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 0fd6d74c324..08d934251af 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -99,25 +99,21 @@ static int bpy_bmloopuv_flag_set(BPy_BMLoopUV *self, PyObject *value, void *flag static PyGetSetDef bpy_bmloopuv_getseters[] = { /* attributes match rna_def_mloopuv */ - {(char *)"uv", - (getter)bpy_bmloopuv_uv_get, - (setter)bpy_bmloopuv_uv_set, - (char *)bpy_bmloopuv_uv_doc, - NULL}, - {(char *)"pin_uv", + {"uv", (getter)bpy_bmloopuv_uv_get, (setter)bpy_bmloopuv_uv_set, bpy_bmloopuv_uv_doc, NULL}, + {"pin_uv", (getter)bpy_bmloopuv_flag_get, (setter)bpy_bmloopuv_flag_set, - (char *)bpy_bmloopuv_flag__pin_uv_doc, + bpy_bmloopuv_flag__pin_uv_doc, (void *)MLOOPUV_PINNED}, - {(char *)"select", + {"select", (getter)bpy_bmloopuv_flag_get, (setter)bpy_bmloopuv_flag_set, - (char *)bpy_bmloopuv_flag__select_doc, + bpy_bmloopuv_flag__select_doc, (void *)MLOOPUV_VERTSEL}, - {(char *)"select_edge", + {"select_edge", (getter)bpy_bmloopuv_flag_get, (setter)bpy_bmloopuv_flag_set, - (char *)bpy_bmloopuv_flag__select_edge_doc, + bpy_bmloopuv_flag__select_edge_doc, (void *)MLOOPUV_EDGESEL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ @@ -219,20 +215,20 @@ static int bpy_bmvertskin_flag_set(BPy_BMVertSkin *self, PyObject *value, void * static PyGetSetDef bpy_bmvertskin_getseters[] = { /* attributes match rna_mesh_gen */ - {(char *)"radius", + {"radius", (getter)bpy_bmvertskin_radius_get, (setter)bpy_bmvertskin_radius_set, - (char *)bpy_bmvertskin_radius_doc, + bpy_bmvertskin_radius_doc, NULL}, - {(char *)"use_root", + {"use_root", (getter)bpy_bmvertskin_flag_get, (setter)bpy_bmvertskin_flag_set, - (char *)bpy_bmvertskin_flag__use_root_doc, + bpy_bmvertskin_flag__use_root_doc, (void *)MVERT_SKIN_ROOT}, - {(char *)"use_loose", + {"use_loose", (getter)bpy_bmvertskin_flag_get, (setter)bpy_bmvertskin_flag_set, - (char *)bpy_bmvertskin_flag__use_loose_doc, + bpy_bmvertskin_flag__use_loose_doc, (void *)MVERT_SKIN_LOOSE}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ diff --git a/source/blender/python/bmesh/bmesh_py_types_select.c b/source/blender/python/bmesh/bmesh_py_types_select.c index 228874a86e3..dc0cf59d38c 100644 --- a/source/blender/python/bmesh/bmesh_py_types_select.c +++ b/source/blender/python/bmesh/bmesh_py_types_select.c @@ -57,10 +57,10 @@ static PyObject *bpy_bmeditselseq_active_get(BPy_BMEditSelSeq *self, void *UNUSE } static PyGetSetDef bpy_bmeditselseq_getseters[] = { - {(char *)"active", + {"active", (getter)bpy_bmeditselseq_active_get, (setter)NULL, - (char *)bpy_bmeditselseq_active_doc, + bpy_bmeditselseq_active_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c index 1b6466dee68..3f8ec826cc3 100644 --- a/source/blender/python/generic/bgl.c +++ b/source/blender/python/generic/bgl.c @@ -576,7 +576,7 @@ static PyMethodDef Buffer_methods[] = { }; static PyGetSetDef Buffer_getseters[] = { - {(char *)"dimensions", (getter)Buffer_dimensions, NULL, NULL, NULL}, + {"dimensions", (getter)Buffer_dimensions, NULL, NULL, NULL}, {NULL, NULL, NULL, NULL, NULL}, }; diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index 1ea7795a0e3..ae9ffe4f3b8 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -267,10 +267,10 @@ static PyObject *BPy_IDGroup_GetType(BPy_IDProperty *self) #endif static PyGetSetDef BPy_IDGroup_getseters[] = { - {(char *)"name", + {"name", (getter)BPy_IDGroup_GetName, (setter)BPy_IDGroup_SetName, - (char *)"The name of this Group.", + "The name of this Group.", NULL}, {NULL, NULL, NULL, NULL, NULL}, }; @@ -1269,7 +1269,7 @@ static PyObject *BPy_IDArray_get_typecode(BPy_IDArray *self) static PyGetSetDef BPy_IDArray_getseters[] = { /* matches pythons array.typecode */ - {(char *)"typecode", + {"typecode", (getter)BPy_IDArray_get_typecode, (setter)NULL, BPy_IDArray_get_typecode_doc, diff --git a/source/blender/python/generic/imbuf_py_api.c b/source/blender/python/generic/imbuf_py_api.c index d35fc027f43..32fe522b84d 100644 --- a/source/blender/python/generic/imbuf_py_api.c +++ b/source/blender/python/generic/imbuf_py_api.c @@ -289,19 +289,15 @@ static PyObject *py_imbuf_channels_get(Py_ImBuf *self, void *UNUSED(closure)) } static PyGetSetDef Py_ImBuf_getseters[] = { - {(char *)"size", (getter)py_imbuf_size_get, (setter)NULL, (char *)py_imbuf_size_doc, NULL}, - {(char *)"ppm", - (getter)py_imbuf_ppm_get, - (setter)py_imbuf_ppm_set, - (char *)py_imbuf_ppm_doc, - NULL}, - {(char *)"filepath", + {"size", (getter)py_imbuf_size_get, (setter)NULL, py_imbuf_size_doc, NULL}, + {"ppm", (getter)py_imbuf_ppm_get, (setter)py_imbuf_ppm_set, py_imbuf_ppm_doc, NULL}, + {"filepath", (getter)py_imbuf_filepath_get, (setter)py_imbuf_filepath_set, - (char *)py_imbuf_filepath_doc, + py_imbuf_filepath_doc, NULL}, - {(char *)"planes", (getter)py_imbuf_planes_get, NULL, (char *)py_imbuf_planes_doc, NULL}, - {(char *)"channels", (getter)py_imbuf_channels_get, NULL, (char *)py_imbuf_channels_doc, NULL}, + {"planes", (getter)py_imbuf_planes_get, NULL, py_imbuf_planes_doc, NULL}, + {"channels", (getter)py_imbuf_channels_get, NULL, py_imbuf_channels_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/gpu/gpu_py_offscreen.c b/source/blender/python/gpu/gpu_py_offscreen.c index 6505e59624b..77dd4891e17 100644 --- a/source/blender/python/gpu/gpu_py_offscreen.c +++ b/source/blender/python/gpu/gpu_py_offscreen.c @@ -303,17 +303,13 @@ static void BPyGPUOffScreen__tp_dealloc(BPyGPUOffScreen *self) } static PyGetSetDef bpygpu_offscreen_getseters[] = { - {(char *)"color_texture", + {"color_texture", (getter)bpygpu_offscreen_color_texture_get, (setter)NULL, bpygpu_offscreen_color_texture_doc, NULL}, - {(char *)"width", - (getter)bpygpu_offscreen_width_get, - (setter)NULL, - bpygpu_offscreen_width_doc, - NULL}, - {(char *)"height", + {"width", (getter)bpygpu_offscreen_width_get, (setter)NULL, bpygpu_offscreen_width_doc, NULL}, + {"height", (getter)bpygpu_offscreen_height_get, (setter)NULL, bpygpu_offscreen_height_doc, diff --git a/source/blender/python/gpu/gpu_py_shader.c b/source/blender/python/gpu/gpu_py_shader.c index 87091e311f3..bd52fbb0de5 100644 --- a/source/blender/python/gpu/gpu_py_shader.c +++ b/source/blender/python/gpu/gpu_py_shader.c @@ -578,11 +578,7 @@ static PyObject *bpygpu_shader_program_get(BPyGPUShader *self, void *UNUSED(clos } static PyGetSetDef bpygpu_shader_getseters[] = { - {(char *)"program", - (getter)bpygpu_shader_program_get, - (setter)NULL, - bpygpu_shader_program_doc, - NULL}, + {"program", (getter)bpygpu_shader_program_get, (setter)NULL, bpygpu_shader_program_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c index cbd57b28242..043b31007f1 100644 --- a/source/blender/python/intern/bpy_app.c +++ b/source/blender/python/intern/bpy_app.c @@ -81,49 +81,46 @@ extern char build_system[]; static PyTypeObject BlenderAppType; static PyStructSequence_Field app_info_fields[] = { - {(char *)"version", (char *)"The Blender version as a tuple of 3 numbers. eg. (2, 50, 11)"}, - {(char *)"version_string", (char *)"The Blender version formatted as a string"}, - {(char *)"version_char", (char *)"The Blender version character (for minor releases)"}, - {(char *)"version_cycle", (char *)"The release status of this build alpha/beta/rc/release"}, - {(char *)"binary_path", - (char *)"The location of Blender's executable, useful for utilities that open new instances"}, - {(char *)"background", - (char *)"Boolean, True when blender is running without a user interface (started with -b)"}, - {(char *)"factory_startup", - (char *)"Boolean, True when blender is running with --factory-startup)"}, + {"version", "The Blender version as a tuple of 3 numbers. eg. (2, 50, 11)"}, + {"version_string", "The Blender version formatted as a string"}, + {"version_char", "The Blender version character (for minor releases)"}, + {"version_cycle", "The release status of this build alpha/beta/rc/release"}, + {"binary_path", + "The location of Blender's executable, useful for utilities that open new instances"}, + {"background", + "Boolean, True when blender is running without a user interface (started with -b)"}, + {"factory_startup", "Boolean, True when blender is running with --factory-startup)"}, /* buildinfo */ - {(char *)"build_date", (char *)"The date this blender instance was built"}, - {(char *)"build_time", (char *)"The time this blender instance was built"}, - {(char *)"build_commit_timestamp", - (char *)"The unix timestamp of commit this blender instance was built"}, - {(char *)"build_commit_date", (char *)"The date of commit this blender instance was built"}, - {(char *)"build_commit_time", (char *)"The time of commit this blender instance was built"}, - {(char *)"build_hash", (char *)"The commit hash this blender instance was built with"}, - {(char *)"build_branch", (char *)"The branch this blender instance was built from"}, - {(char *)"build_platform", (char *)"The platform this blender instance was built for"}, - {(char *)"build_type", (char *)"The type of build (Release, Debug)"}, - {(char *)"build_cflags", (char *)"C compiler flags"}, - {(char *)"build_cxxflags", (char *)"C++ compiler flags"}, - {(char *)"build_linkflags", (char *)"Binary linking flags"}, - {(char *)"build_system", (char *)"Build system used"}, + {"build_date", "The date this blender instance was built"}, + {"build_time", "The time this blender instance was built"}, + {"build_commit_timestamp", "The unix timestamp of commit this blender instance was built"}, + {"build_commit_date", "The date of commit this blender instance was built"}, + {"build_commit_time", "The time of commit this blender instance was built"}, + {"build_hash", "The commit hash this blender instance was built with"}, + {"build_branch", "The branch this blender instance was built from"}, + {"build_platform", "The platform this blender instance was built for"}, + {"build_type", "The type of build (Release, Debug)"}, + {"build_cflags", "C compiler flags"}, + {"build_cxxflags", "C++ compiler flags"}, + {"build_linkflags", "Binary linking flags"}, + {"build_system", "Build system used"}, /* submodules */ - {(char *)"alembic", (char *)"Alembic library information backend"}, - {(char *)"ffmpeg", (char *)"FFmpeg library information backend"}, - {(char *)"ocio", (char *)"OpenColorIO library information backend"}, - {(char *)"oiio", (char *)"OpenImageIO library information backend"}, - {(char *)"opensubdiv", (char *)"OpenSubdiv library information backend"}, - {(char *)"openvdb", (char *)"OpenVDB library information backend"}, - {(char *)"sdl", (char *)"SDL library information backend"}, - {(char *)"build_options", - (char *)"A set containing most important enabled optional build features"}, - {(char *)"handlers", (char *)"Application handler callbacks"}, - {(char *)"translations", (char *)"Application and addons internationalization API"}, + {"alembic", "Alembic library information backend"}, + {"ffmpeg", "FFmpeg library information backend"}, + {"ocio", "OpenColorIO library information backend"}, + {"oiio", "OpenImageIO library information backend"}, + {"opensubdiv", "OpenSubdiv library information backend"}, + {"openvdb", "OpenVDB library information backend"}, + {"sdl", "SDL library information backend"}, + {"build_options", "A set containing most important enabled optional build features"}, + {"handlers", "Application handler callbacks"}, + {"translations", "Application and addons internationalization API"}, /* Modules (not struct sequence). */ - {(char *)"icons", (char *)"Manage custom icons"}, - {(char *)"timers", (char *)"Manage timers"}, + {"icons", "Manage custom icons"}, + {"timers", "Manage timers"}, {NULL}, }; @@ -141,9 +138,9 @@ PyDoc_STRVAR(bpy_app_doc, " bpy.app.translations.rst\n"); static PyStructSequence_Desc app_info_desc = { - (char *)"bpy.app", /* name */ - bpy_app_doc, /* doc */ - app_info_fields, /* fields */ + "bpy.app", /* name */ + bpy_app_doc, /* doc */ + app_info_fields, /* fields */ ARRAY_SIZE(app_info_fields) - 1, }; @@ -416,145 +413,125 @@ static int bpy_app_use_override_library_set(PyObject *UNUSED(self), } static PyGetSetDef bpy_app_getsets[] = { - {(char *)"debug", + {"debug", bpy_app_debug_get, bpy_app_debug_set, bpy_app_debug_doc, (void *)G_DEBUG}, + {"debug_ffmpeg", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, - (void *)G_DEBUG}, - {(char *)"debug_ffmpeg", - bpy_app_debug_get, - bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_FFMPEG}, - {(char *)"debug_freestyle", + {"debug_freestyle", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_FREESTYLE}, - {(char *)"debug_python", + {"debug_python", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_PYTHON}, - {(char *)"debug_events", + {"debug_events", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_EVENTS}, - {(char *)"debug_handlers", + {"debug_handlers", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_HANDLERS}, - {(char *)"debug_wm", - bpy_app_debug_get, - bpy_app_debug_set, - (char *)bpy_app_debug_doc, - (void *)G_DEBUG_WM}, - {(char *)"debug_depsgraph", + {"debug_wm", bpy_app_debug_get, bpy_app_debug_set, bpy_app_debug_doc, (void *)G_DEBUG_WM}, + {"debug_depsgraph", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_DEPSGRAPH}, - {(char *)"debug_depsgraph_build", + {"debug_depsgraph_build", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_DEPSGRAPH_BUILD}, - {(char *)"debug_depsgraph_eval", + {"debug_depsgraph_eval", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_DEPSGRAPH_EVAL}, - {(char *)"debug_depsgraph_tag", + {"debug_depsgraph_tag", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_DEPSGRAPH_TAG}, - {(char *)"debug_depsgraph_time", + {"debug_depsgraph_time", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_DEPSGRAPH_TIME}, - {(char *)"debug_depsgraph_pretty", + {"debug_depsgraph_pretty", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_DEPSGRAPH_PRETTY}, - {(char *)"debug_simdata", + {"debug_simdata", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_SIMDATA}, - {(char *)"debug_gpumem", + {"debug_gpumem", bpy_app_debug_get, bpy_app_debug_set, - (char *)bpy_app_debug_doc, + bpy_app_debug_doc, (void *)G_DEBUG_GPU_MEM}, - {(char *)"debug_io", - bpy_app_debug_get, - bpy_app_debug_set, - (char *)bpy_app_debug_doc, - (void *)G_DEBUG_IO}, + {"debug_io", bpy_app_debug_get, bpy_app_debug_set, bpy_app_debug_doc, (void *)G_DEBUG_IO}, - {(char *)"use_override_library", + {"use_override_library", bpy_app_use_override_library_get, bpy_app_use_override_library_set, - (char *)bpy_app_use_override_library_doc, + bpy_app_use_override_library_doc, NULL}, - {(char *)"use_event_simulate", + {"use_event_simulate", bpy_app_global_flag_get, bpy_app_global_flag_set__only_disable, - (char *)bpy_app_global_flag_doc, + bpy_app_global_flag_doc, (void *)G_FLAG_EVENT_SIMULATE}, - {(char *)"use_userpref_skip_save_on_exit", + {"use_userpref_skip_save_on_exit", bpy_app_global_flag_get, bpy_app_global_flag_set, - (char *)bpy_app_global_flag_doc, + bpy_app_global_flag_doc, (void *)G_FLAG_USERPREF_NO_SAVE_ON_EXIT}, - {(char *)"binary_path_python", + {"binary_path_python", bpy_app_binary_path_python_get, NULL, - (char *)bpy_app_binary_path_python_doc, + bpy_app_binary_path_python_doc, NULL}, - {(char *)"debug_value", + {"debug_value", bpy_app_debug_value_get, bpy_app_debug_value_set, - (char *)bpy_app_debug_value_doc, - NULL}, - {(char *)"tempdir", bpy_app_tempdir_get, NULL, (char *)bpy_app_tempdir_doc, NULL}, - {(char *)"driver_namespace", - bpy_app_driver_dict_get, - NULL, - (char *)bpy_app_driver_dict_doc, + bpy_app_debug_value_doc, NULL}, + {"tempdir", bpy_app_tempdir_get, NULL, bpy_app_tempdir_doc, NULL}, + {"driver_namespace", bpy_app_driver_dict_get, NULL, bpy_app_driver_dict_doc, NULL}, - {(char *)"render_icon_size", + {"render_icon_size", bpy_app_preview_render_size_get, NULL, - (char *)bpy_app_preview_render_size_doc, + bpy_app_preview_render_size_doc, (void *)ICON_SIZE_ICON}, - {(char *)"render_preview_size", + {"render_preview_size", bpy_app_preview_render_size_get, NULL, - (char *)bpy_app_preview_render_size_doc, + bpy_app_preview_render_size_doc, (void *)ICON_SIZE_PREVIEW}, /* security */ - {(char *)"autoexec_fail", - bpy_app_global_flag_get, - NULL, - NULL, - (void *)G_FLAG_SCRIPT_AUTOEXEC_FAIL}, - {(char *)"autoexec_fail_quiet", + {"autoexec_fail", bpy_app_global_flag_get, NULL, NULL, (void *)G_FLAG_SCRIPT_AUTOEXEC_FAIL}, + {"autoexec_fail_quiet", bpy_app_global_flag_get, NULL, NULL, (void *)G_FLAG_SCRIPT_AUTOEXEC_FAIL_QUIET}, - {(char *)"autoexec_fail_message", bpy_app_autoexec_fail_message_get, NULL, NULL, NULL}, + {"autoexec_fail_message", bpy_app_autoexec_fail_message_get, NULL, NULL, NULL}, {NULL, NULL, NULL, NULL, NULL}, }; diff --git a/source/blender/python/intern/bpy_app_alembic.c b/source/blender/python/intern/bpy_app_alembic.c index 6032e062d09..c02bb546553 100644 --- a/source/blender/python/intern/bpy_app_alembic.c +++ b/source/blender/python/intern/bpy_app_alembic.c @@ -35,16 +35,16 @@ static PyTypeObject BlenderAppABCType; static PyStructSequence_Field app_alembic_info_fields[] = { - {(char *)"supported", (char *)"Boolean, True when Blender is built with Alembic support"}, - {(char *)"version", (char *)"The Alembic version as a tuple of 3 numbers"}, - {(char *)"version_string", (char *)"The Alembic version formatted as a string"}, + {"supported", "Boolean, True when Blender is built with Alembic support"}, + {"version", "The Alembic version as a tuple of 3 numbers"}, + {"version_string", "The Alembic version formatted as a string"}, {NULL}, }; static PyStructSequence_Desc app_alembic_info_desc = { - (char *)"bpy.app.alembic", /* name */ - (char *)"This module contains information about Alembic blender is linked against", /* doc */ - app_alembic_info_fields, /* fields */ + "bpy.app.alembic", /* name */ + "This module contains information about Alembic blender is linked against", /* doc */ + app_alembic_info_fields, /* fields */ ARRAY_SIZE(app_alembic_info_fields) - 1, }; diff --git a/source/blender/python/intern/bpy_app_build_options.c b/source/blender/python/intern/bpy_app_build_options.c index 7d2645e7776..39fcfa8b7bf 100644 --- a/source/blender/python/intern/bpy_app_build_options.c +++ b/source/blender/python/intern/bpy_app_build_options.c @@ -28,45 +28,45 @@ static PyTypeObject BlenderAppBuildOptionsType; static PyStructSequence_Field app_builtopts_info_fields[] = { /* names mostly follow CMake options, lowercase, after WITH_ */ - {(char *)"bullet", NULL}, - {(char *)"codec_avi", NULL}, - {(char *)"codec_ffmpeg", NULL}, - {(char *)"codec_sndfile", NULL}, - {(char *)"compositor", NULL}, - {(char *)"cycles", NULL}, - {(char *)"cycles_osl", NULL}, - {(char *)"freestyle", NULL}, - {(char *)"image_cineon", NULL}, - {(char *)"image_dds", NULL}, - {(char *)"image_hdr", NULL}, - {(char *)"image_openexr", NULL}, - {(char *)"image_openjpeg", NULL}, - {(char *)"image_tiff", NULL}, - {(char *)"input_ndof", NULL}, - {(char *)"audaspace", NULL}, - {(char *)"international", NULL}, - {(char *)"openal", NULL}, - {(char *)"opensubdiv", NULL}, - {(char *)"sdl", NULL}, - {(char *)"sdl_dynload", NULL}, - {(char *)"jack", NULL}, - {(char *)"libmv", NULL}, - {(char *)"mod_oceansim", NULL}, - {(char *)"mod_remesh", NULL}, - {(char *)"collada", NULL}, - {(char *)"opencolorio", NULL}, - {(char *)"openmp", NULL}, - {(char *)"openvdb", NULL}, - {(char *)"alembic", NULL}, - {(char *)"usd", NULL}, - {(char *)"fluid", NULL}, + {"bullet", NULL}, + {"codec_avi", NULL}, + {"codec_ffmpeg", NULL}, + {"codec_sndfile", NULL}, + {"compositor", NULL}, + {"cycles", NULL}, + {"cycles_osl", NULL}, + {"freestyle", NULL}, + {"image_cineon", NULL}, + {"image_dds", NULL}, + {"image_hdr", NULL}, + {"image_openexr", NULL}, + {"image_openjpeg", NULL}, + {"image_tiff", NULL}, + {"input_ndof", NULL}, + {"audaspace", NULL}, + {"international", NULL}, + {"openal", NULL}, + {"opensubdiv", NULL}, + {"sdl", NULL}, + {"sdl_dynload", NULL}, + {"jack", NULL}, + {"libmv", NULL}, + {"mod_oceansim", NULL}, + {"mod_remesh", NULL}, + {"collada", NULL}, + {"opencolorio", NULL}, + {"openmp", NULL}, + {"openvdb", NULL}, + {"alembic", NULL}, + {"usd", NULL}, + {"fluid", NULL}, {NULL}, }; static PyStructSequence_Desc app_builtopts_info_desc = { - (char *)"bpy.app.build_options", /* name */ - (char *)"This module contains information about options blender is built with", /* doc */ - app_builtopts_info_fields, /* fields */ + "bpy.app.build_options", /* name */ + "This module contains information about options blender is built with", /* doc */ + app_builtopts_info_fields, /* fields */ ARRAY_SIZE(app_builtopts_info_fields) - 1, }; diff --git a/source/blender/python/intern/bpy_app_ffmpeg.c b/source/blender/python/intern/bpy_app_ffmpeg.c index d1aa7817538..7f12f7be7ab 100644 --- a/source/blender/python/intern/bpy_app_ffmpeg.c +++ b/source/blender/python/intern/bpy_app_ffmpeg.c @@ -36,13 +36,13 @@ static PyTypeObject BlenderAppFFmpegType; #define DEF_FFMPEG_LIB_VERSION(lib) \ - {(char *)(#lib "_version"), (char *)("The " #lib " version as a tuple of 3 numbers")}, \ + {(#lib "_version"), ("The " #lib " version as a tuple of 3 numbers")}, \ { \ - (char *)(#lib "_version_string"), (char *)("The " #lib " version formatted as a string") \ + (#lib "_version_string"), ("The " #lib " version formatted as a string") \ } static PyStructSequence_Field app_ffmpeg_info_fields[] = { - {(char *)"supported", (char *)("Boolean, True when Blender is built with FFmpeg support")}, + {"supported", "Boolean, True when Blender is built with FFmpeg support"}, DEF_FFMPEG_LIB_VERSION(avcodec), DEF_FFMPEG_LIB_VERSION(avdevice), @@ -55,9 +55,9 @@ static PyStructSequence_Field app_ffmpeg_info_fields[] = { #undef DEF_FFMPEG_LIB_VERSION static PyStructSequence_Desc app_ffmpeg_info_desc = { - (char *)"bpy.app.ffmpeg", /* name */ - (char *)"This module contains information about FFmpeg blender is linked against", /* doc */ - app_ffmpeg_info_fields, /* fields */ + "bpy.app.ffmpeg", /* name */ + "This module contains information about FFmpeg blender is linked against", /* doc */ + app_ffmpeg_info_fields, /* fields */ ARRAY_SIZE(app_ffmpeg_info_fields) - 1, }; diff --git a/source/blender/python/intern/bpy_app_handlers.c b/source/blender/python/intern/bpy_app_handlers.c index 2fbefe3be74..01618f0184a 100644 --- a/source/blender/python/intern/bpy_app_handlers.c +++ b/source/blender/python/intern/bpy_app_handlers.c @@ -44,42 +44,41 @@ void bpy_app_generic_callback(struct Main *main, static PyTypeObject BlenderAppCbType; static PyStructSequence_Field app_cb_info_fields[] = { - {(char *)"frame_change_pre", (char *)"on frame change for playback and rendering (before)"}, - {(char *)"frame_change_post", (char *)"on frame change for playback and rendering (after)"}, - {(char *)"render_pre", (char *)"on render (before)"}, - {(char *)"render_post", (char *)"on render (after)"}, - {(char *)"render_write", - (char *)"on writing a render frame (directly after the frame is written)"}, - {(char *)"render_stats", (char *)"on printing render statistics"}, - {(char *)"render_init", (char *)"on initialization of a render job"}, - {(char *)"render_complete", (char *)"on completion of render job"}, - {(char *)"render_cancel", (char *)"on canceling a render job"}, - {(char *)"load_pre", (char *)"on loading a new blend file (before)"}, - {(char *)"load_post", (char *)"on loading a new blend file (after)"}, - {(char *)"save_pre", (char *)"on saving a blend file (before)"}, - {(char *)"save_post", (char *)"on saving a blend file (after)"}, - {(char *)"undo_pre", (char *)"on loading an undo step (before)"}, - {(char *)"undo_post", (char *)"on loading an undo step (after)"}, - {(char *)"redo_pre", (char *)"on loading a redo step (before)"}, - {(char *)"redo_post", (char *)"on loading a redo step (after)"}, - {(char *)"depsgraph_update_pre", (char *)"on depsgraph update (pre)"}, - {(char *)"depsgraph_update_post", (char *)"on depsgraph update (post)"}, - {(char *)"version_update", (char *)"on ending the versioning code"}, - {(char *)"load_factory_preferences_post", (char *)"on loading factory preferences (after)"}, - {(char *)"load_factory_startup_post", (char *)"on loading factory startup (after)"}, + {"frame_change_pre", "on frame change for playback and rendering (before)"}, + {"frame_change_post", "on frame change for playback and rendering (after)"}, + {"render_pre", "on render (before)"}, + {"render_post", "on render (after)"}, + {"render_write", "on writing a render frame (directly after the frame is written)"}, + {"render_stats", "on printing render statistics"}, + {"render_init", "on initialization of a render job"}, + {"render_complete", "on completion of render job"}, + {"render_cancel", "on canceling a render job"}, + {"load_pre", "on loading a new blend file (before)"}, + {"load_post", "on loading a new blend file (after)"}, + {"save_pre", "on saving a blend file (before)"}, + {"save_post", "on saving a blend file (after)"}, + {"undo_pre", "on loading an undo step (before)"}, + {"undo_post", "on loading an undo step (after)"}, + {"redo_pre", "on loading a redo step (before)"}, + {"redo_post", "on loading a redo step (after)"}, + {"depsgraph_update_pre", "on depsgraph update (pre)"}, + {"depsgraph_update_post", "on depsgraph update (post)"}, + {"version_update", "on ending the versioning code"}, + {"load_factory_preferences_post", "on loading factory preferences (after)"}, + {"load_factory_startup_post", "on loading factory startup (after)"}, /* sets the permanent tag */ #define APP_CB_OTHER_FIELDS 1 - {(char *)"persistent", - (char *)"Function decorator for callback functions not to be removed when loading new files"}, + {"persistent", + "Function decorator for callback functions not to be removed when loading new files"}, {NULL}, }; static PyStructSequence_Desc app_cb_info_desc = { - (char *)"bpy.app.handlers", /* name */ - (char *)"This module contains callback lists", /* doc */ - app_cb_info_fields, /* fields */ + "bpy.app.handlers", /* name */ + "This module contains callback lists", /* doc */ + app_cb_info_fields, /* fields */ ARRAY_SIZE(app_cb_info_fields) - 1, }; diff --git a/source/blender/python/intern/bpy_app_ocio.c b/source/blender/python/intern/bpy_app_ocio.c index 9dcadbac2af..750fe93d1de 100644 --- a/source/blender/python/intern/bpy_app_ocio.c +++ b/source/blender/python/intern/bpy_app_ocio.c @@ -32,18 +32,17 @@ static PyTypeObject BlenderAppOCIOType; static PyStructSequence_Field app_ocio_info_fields[] = { - {(char *)"supported", - (char *)("Boolean, True when Blender is built with OpenColorIO support")}, - {(char *)("version"), (char *)("The OpenColorIO version as a tuple of 3 numbers")}, - {(char *)("version_string"), (char *)("The OpenColorIO version formatted as a string")}, + {"supported", "Boolean, True when Blender is built with OpenColorIO support"}, + {"version", "The OpenColorIO version as a tuple of 3 numbers"}, + {"version_string", "The OpenColorIO version formatted as a string"}, {NULL}, }; static PyStructSequence_Desc app_ocio_info_desc = { /* name */ - (char *)"bpy.app.ocio", + "bpy.app.ocio", /* doc */ - (char *)"This module contains information about OpenColorIO blender is linked against", + "This module contains information about OpenColorIO blender is linked against", /* fields */ app_ocio_info_fields, ARRAY_SIZE(app_ocio_info_fields) - 1, diff --git a/source/blender/python/intern/bpy_app_oiio.c b/source/blender/python/intern/bpy_app_oiio.c index 05c192f6e2e..44ffce2ad07 100644 --- a/source/blender/python/intern/bpy_app_oiio.c +++ b/source/blender/python/intern/bpy_app_oiio.c @@ -32,18 +32,16 @@ static PyTypeObject BlenderAppOIIOType; static PyStructSequence_Field app_oiio_info_fields[] = { - {(char *)"supported", - (char *)("Boolean, True when Blender is built with OpenImageIO support")}, - {(char *)("version"), (char *)("The OpenImageIO version as a tuple of 3 numbers")}, - {(char *)("version_string"), (char *)("The OpenImageIO version formatted as a string")}, + {"supported", "Boolean, True when Blender is built with OpenImageIO support"}, + {"version", "The OpenImageIO version as a tuple of 3 numbers"}, + {"version_string", "The OpenImageIO version formatted as a string"}, {NULL}, }; static PyStructSequence_Desc app_oiio_info_desc = { - (char *)"bpy.app.oiio", /* name */ - (char - *)"This module contains information about OpeImageIO blender is linked against", /* doc */ - app_oiio_info_fields, /* fields */ + "bpy.app.oiio", /* name */ + "This module contains information about OpeImageIO blender is linked against", /* doc */ + app_oiio_info_fields, /* fields */ ARRAY_SIZE(app_oiio_info_fields) - 1, }; diff --git a/source/blender/python/intern/bpy_app_opensubdiv.c b/source/blender/python/intern/bpy_app_opensubdiv.c index e6e84ac30c0..2b3c2f18e43 100644 --- a/source/blender/python/intern/bpy_app_opensubdiv.c +++ b/source/blender/python/intern/bpy_app_opensubdiv.c @@ -32,17 +32,16 @@ static PyTypeObject BlenderAppOpenSubdivType; static PyStructSequence_Field app_opensubdiv_info_fields[] = { - {(char *)"supported", (char *)("Boolean, True when Blender is built with OpenSubdiv support")}, - {(char *)("version"), (char *)("The OpenSubdiv version as a tuple of 3 numbers")}, - {(char *)("version_string"), (char *)("The OpenSubdiv version formatted as a string")}, + {"supported", "Boolean, True when Blender is built with OpenSubdiv support"}, + {"version", "The OpenSubdiv version as a tuple of 3 numbers"}, + {"version_string", "The OpenSubdiv version formatted as a string"}, {NULL}, }; static PyStructSequence_Desc app_opensubdiv_info_desc = { - (char *)"bpy.app.opensubdiv", /* name */ - (char - *)"This module contains information about OpenSubdiv blender is linked against", /* doc */ - app_opensubdiv_info_fields, /* fields */ + "bpy.app.opensubdiv", /* name */ + "This module contains information about OpenSubdiv blender is linked against", /* doc */ + app_opensubdiv_info_fields, /* fields */ ARRAY_SIZE(app_opensubdiv_info_fields) - 1, }; diff --git a/source/blender/python/intern/bpy_app_openvdb.c b/source/blender/python/intern/bpy_app_openvdb.c index a3d02294c07..80732b7fecb 100644 --- a/source/blender/python/intern/bpy_app_openvdb.c +++ b/source/blender/python/intern/bpy_app_openvdb.c @@ -35,16 +35,16 @@ static PyTypeObject BlenderAppOVDBType; static PyStructSequence_Field app_openvdb_info_fields[] = { - {(char *)"supported", (char *)("Boolean, True when Blender is built with OpenVDB support")}, - {(char *)("version"), (char *)("The OpenVDB version as a tuple of 3 numbers")}, - {(char *)("version_string"), (char *)("The OpenVDB version formatted as a string")}, + {"supported", "Boolean, True when Blender is built with OpenVDB support"}, + {"version", "The OpenVDB version as a tuple of 3 numbers"}, + {"version_string", "The OpenVDB version formatted as a string"}, {NULL}, }; static PyStructSequence_Desc app_openvdb_info_desc = { - (char *)"bpy.app.openvdb", /* name */ - (char *)"This module contains information about OpenVDB blender is linked against", /* doc */ - app_openvdb_info_fields, /* fields */ + "bpy.app.openvdb", /* name */ + "This module contains information about OpenVDB blender is linked against", /* doc */ + app_openvdb_info_fields, /* fields */ ARRAY_SIZE(app_openvdb_info_fields) - 1, }; diff --git a/source/blender/python/intern/bpy_app_sdl.c b/source/blender/python/intern/bpy_app_sdl.c index 7e3d02076f2..1bc3d07473a 100644 --- a/source/blender/python/intern/bpy_app_sdl.c +++ b/source/blender/python/intern/bpy_app_sdl.c @@ -46,20 +46,20 @@ static PyTypeObject BlenderAppSDLType; static PyStructSequence_Field app_sdl_info_fields[] = { - {(char *)"supported", (char *)("Boolean, True when Blender is built with SDL support")}, - {(char *)"version", (char *)("The SDL version as a tuple of 3 numbers")}, - {(char *)"version_string", (char *)("The SDL version formatted as a string")}, - {(char *)"available", - (char *)("Boolean, True when SDL is available. This is False when " - "either *supported* is False, or *dynload* is True and " - "Blender cannot find the correct library.")}, + {"supported", ("Boolean, True when Blender is built with SDL support")}, + {"version", ("The SDL version as a tuple of 3 numbers")}, + {"version_string", ("The SDL version formatted as a string")}, + {"available", + ("Boolean, True when SDL is available. This is False when " + "either *supported* is False, or *dynload* is True and " + "Blender cannot find the correct library.")}, {NULL}, }; static PyStructSequence_Desc app_sdl_info_desc = { - (char *)"bpy.app.sdl", /* name */ - (char *)"This module contains information about SDL blender is linked against", /* doc */ - app_sdl_info_fields, /* fields */ + "bpy.app.sdl", /* name */ + "This module contains information about SDL blender is linked against", /* doc */ + app_sdl_info_fields, /* fields */ ARRAY_SIZE(app_sdl_info_fields) - 1, }; diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index fffa43c1dcd..2e88a9ccca7 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -402,9 +402,9 @@ static BLT_i18n_contexts_descriptor _contexts[] = BLT_I18NCONTEXTS_DESC; static PyStructSequence_Field app_translations_contexts_fields[ARRAY_SIZE(_contexts)] = {{NULL}}; static PyStructSequence_Desc app_translations_contexts_desc = { - (char *)"bpy.app.translations.contexts", /* name */ - (char *)"This named tuple contains all pre-defined translation contexts", /* doc */ - app_translations_contexts_fields, /* fields */ + "bpy.app.translations.contexts", /* name */ + "This named tuple contains all pre-defined translation contexts", /* doc */ + app_translations_contexts_fields, /* fields */ ARRAY_SIZE(app_translations_contexts_fields) - 1, }; @@ -453,12 +453,12 @@ PyDoc_STRVAR(app_translations_contexts_C_to_py_doc, "A readonly dict mapping contexts' C-identifiers to their py-identifiers."); static PyMemberDef app_translations_members[] = { - {(char *)"contexts", + {"contexts", T_OBJECT_EX, offsetof(BlenderAppTranslations, contexts), READONLY, app_translations_contexts_doc}, - {(char *)"contexts_C_to_py", + {"contexts_C_to_py", T_OBJECT_EX, offsetof(BlenderAppTranslations, contexts_C_to_py), READONLY, @@ -508,16 +508,8 @@ static PyObject *app_translations_locales_get(PyObject *UNUSED(self), void *UNUS static PyGetSetDef app_translations_getseters[] = { /* {name, getter, setter, doc, userdata} */ - {(char *)"locale", - (getter)app_translations_locale_get, - NULL, - app_translations_locale_doc, - NULL}, - {(char *)"locales", - (getter)app_translations_locales_get, - NULL, - app_translations_locales_doc, - NULL}, + {"locale", (getter)app_translations_locale_get, NULL, app_translations_locale_doc, NULL}, + {"locales", (getter)app_translations_locales_get, NULL, app_translations_locales_doc, NULL}, {NULL}, }; @@ -865,7 +857,7 @@ PyObject *BPY_app_translations_struct(void) /* We really populate the contexts' fields here! */ for (ctxt = _contexts, desc = app_translations_contexts_desc.fields; ctxt->c_id; ctxt++, desc++) { - desc->name = (char *)ctxt->py_id; + desc->name = ctxt->py_id; desc->doc = NULL; } desc->name = desc->doc = NULL; /* End sentinel! */ diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index d49e782c317..6c2896db703 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -4771,29 +4771,25 @@ static PyObject *pyrna_struct_get_rna_type(BPy_PropertyRNA *self) /*****************************************************************************/ static PyGetSetDef pyrna_prop_getseters[] = { - {(char *)"id_data", + {"id_data", (getter)pyrna_struct_get_id_data, (setter)NULL, - (char *)pyrna_struct_get_id_data_doc, + pyrna_struct_get_id_data_doc, NULL}, - {(char *)"data", - (getter)pyrna_struct_get_data, - (setter)NULL, - (char *)pyrna_struct_get_data_doc, - NULL}, - {(char *)"rna_type", + {"data", (getter)pyrna_struct_get_data, (setter)NULL, pyrna_struct_get_data_doc, NULL}, + {"rna_type", (getter)pyrna_struct_get_rna_type, (setter)NULL, - (char *)pyrna_struct_get_rna_type_doc, + pyrna_struct_get_rna_type_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; static PyGetSetDef pyrna_struct_getseters[] = { - {(char *)"id_data", + {"id_data", (getter)pyrna_struct_get_id_data, (setter)NULL, - (char *)pyrna_struct_get_id_data_doc, + pyrna_struct_get_id_data_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; @@ -4801,7 +4797,7 @@ static PyGetSetDef pyrna_struct_getseters[] = { static PyObject *pyrna_func_doc_get(BPy_FunctionRNA *self, void *closure); static PyGetSetDef pyrna_func_getseters[] = { - {(char *)"__doc__", (getter)pyrna_func_doc_get, (setter)NULL, NULL, NULL}, + {"__doc__", (getter)pyrna_func_doc_get, (setter)NULL, NULL, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/intern/bpy_utils_units.c b/source/blender/python/intern/bpy_utils_units.c index 645b7e1c7af..fb9a28be430 100644 --- a/source/blender/python/intern/bpy_utils_units.c +++ b/source/blender/python/intern/bpy_utils_units.c @@ -73,15 +73,15 @@ static PyStructSequence_Field bpyunits_systems_fields[ARRAY_SIZE(bpyunits_usyste static PyStructSequence_Field bpyunits_categories_fields[ARRAY_SIZE(bpyunits_ucategorie_items)]; static PyStructSequence_Desc bpyunits_systems_desc = { - (char *)"bpy.utils.units.systems", /* name */ - (char *)"This named tuple contains all pre-defined unit systems", /* doc */ - bpyunits_systems_fields, /* fields */ + "bpy.utils.units.systems", /* name */ + "This named tuple contains all pre-defined unit systems", /* doc */ + bpyunits_systems_fields, /* fields */ ARRAY_SIZE(bpyunits_systems_fields) - 1, }; static PyStructSequence_Desc bpyunits_categories_desc = { - (char *)"bpy.utils.units.categories", /* name */ - (char *)"This named tuple contains all pre-defined unit names", /* doc */ - bpyunits_categories_fields, /* fields */ + "bpy.utils.units.categories", /* name */ + "This named tuple contains all pre-defined unit names", /* doc */ + bpyunits_categories_fields, /* fields */ ARRAY_SIZE(bpyunits_categories_fields) - 1, }; diff --git a/source/blender/python/mathutils/mathutils_Color.c b/source/blender/python/mathutils/mathutils_Color.c index b587738c8d7..739ffb87dbb 100644 --- a/source/blender/python/mathutils/mathutils_Color.c +++ b/source/blender/python/mathutils/mathutils_Color.c @@ -841,59 +841,39 @@ static int Color_hsv_set(ColorObject *self, PyObject *value, void *UNUSED(closur /* Python attributes get/set structure: */ /*****************************************************************************/ static PyGetSetDef Color_getseters[] = { - {(char *)"r", - (getter)Color_channel_get, - (setter)Color_channel_set, - Color_channel_r_doc, - (void *)0}, - {(char *)"g", - (getter)Color_channel_get, - (setter)Color_channel_set, - Color_channel_g_doc, - (void *)1}, - {(char *)"b", - (getter)Color_channel_get, - (setter)Color_channel_set, - Color_channel_b_doc, - (void *)2}, + {"r", (getter)Color_channel_get, (setter)Color_channel_set, Color_channel_r_doc, (void *)0}, + {"g", (getter)Color_channel_get, (setter)Color_channel_set, Color_channel_g_doc, (void *)1}, + {"b", (getter)Color_channel_get, (setter)Color_channel_set, Color_channel_b_doc, (void *)2}, - {(char *)"h", + {"h", (getter)Color_channel_hsv_get, (setter)Color_channel_hsv_set, - (char *)Color_channel_hsv_h_doc, + Color_channel_hsv_h_doc, (void *)0}, - {(char *)"s", + {"s", (getter)Color_channel_hsv_get, (setter)Color_channel_hsv_set, - (char *)Color_channel_hsv_s_doc, + Color_channel_hsv_s_doc, (void *)1}, - {(char *)"v", + {"v", (getter)Color_channel_hsv_get, (setter)Color_channel_hsv_set, - (char *)Color_channel_hsv_v_doc, + Color_channel_hsv_v_doc, (void *)2}, - {(char *)"hsv", - (getter)Color_hsv_get, - (setter)Color_hsv_set, - (char *)Color_hsv_doc, - (void *)0}, + {"hsv", (getter)Color_hsv_get, (setter)Color_hsv_set, Color_hsv_doc, (void *)0}, - {(char *)"is_wrapped", + {"is_wrapped", (getter)BaseMathObject_is_wrapped_get, (setter)NULL, BaseMathObject_is_wrapped_doc, NULL}, - {(char *)"is_frozen", + {"is_frozen", (getter)BaseMathObject_is_frozen_get, (setter)NULL, BaseMathObject_is_frozen_doc, NULL}, - {(char *)"owner", - (getter)BaseMathObject_owner_get, - (setter)NULL, - BaseMathObject_owner_doc, - NULL}, + {"owner", (getter)BaseMathObject_owner_get, (setter)NULL, BaseMathObject_owner_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/mathutils/mathutils_Euler.c b/source/blender/python/mathutils/mathutils_Euler.c index 3fd9bf666e2..65ca932d118 100644 --- a/source/blender/python/mathutils/mathutils_Euler.c +++ b/source/blender/python/mathutils/mathutils_Euler.c @@ -688,30 +688,22 @@ static int Euler_order_set(EulerObject *self, PyObject *value, void *UNUSED(clos /* Python attributes get/set structure: */ /*****************************************************************************/ static PyGetSetDef Euler_getseters[] = { - {(char *)"x", (getter)Euler_axis_get, (setter)Euler_axis_set, Euler_axis_doc, (void *)0}, - {(char *)"y", (getter)Euler_axis_get, (setter)Euler_axis_set, Euler_axis_doc, (void *)1}, - {(char *)"z", (getter)Euler_axis_get, (setter)Euler_axis_set, Euler_axis_doc, (void *)2}, - {(char *)"order", - (getter)Euler_order_get, - (setter)Euler_order_set, - Euler_order_doc, - (void *)NULL}, - - {(char *)"is_wrapped", + {"x", (getter)Euler_axis_get, (setter)Euler_axis_set, Euler_axis_doc, (void *)0}, + {"y", (getter)Euler_axis_get, (setter)Euler_axis_set, Euler_axis_doc, (void *)1}, + {"z", (getter)Euler_axis_get, (setter)Euler_axis_set, Euler_axis_doc, (void *)2}, + {"order", (getter)Euler_order_get, (setter)Euler_order_set, Euler_order_doc, (void *)NULL}, + + {"is_wrapped", (getter)BaseMathObject_is_wrapped_get, (setter)NULL, BaseMathObject_is_wrapped_doc, NULL}, - {(char *)"is_frozen", + {"is_frozen", (getter)BaseMathObject_is_frozen_get, (setter)NULL, BaseMathObject_is_frozen_doc, NULL}, - {(char *)"owner", - (getter)BaseMathObject_owner_get, - (setter)NULL, - BaseMathObject_owner_doc, - NULL}, + {"owner", (getter)BaseMathObject_owner_get, (setter)NULL, BaseMathObject_owner_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c index c6e6d395b6b..32921ae0ca9 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.c +++ b/source/blender/python/mathutils/mathutils_Matrix.c @@ -3021,48 +3021,36 @@ static PyObject *Matrix_is_orthogonal_axis_vectors_get(MatrixObject *self, void /* Python attributes get/set structure: */ /*****************************************************************************/ static PyGetSetDef Matrix_getseters[] = { - {(char *)"median_scale", - (getter)Matrix_median_scale_get, - (setter)NULL, - Matrix_median_scale_doc, - NULL}, - {(char *)"translation", + {"median_scale", (getter)Matrix_median_scale_get, (setter)NULL, Matrix_median_scale_doc, NULL}, + {"translation", (getter)Matrix_translation_get, (setter)Matrix_translation_set, Matrix_translation_doc, NULL}, - {(char *)"row", (getter)Matrix_row_get, (setter)NULL, Matrix_row_doc, NULL}, - {(char *)"col", (getter)Matrix_col_get, (setter)NULL, Matrix_col_doc, NULL}, - {(char *)"is_negative", - (getter)Matrix_is_negative_get, - (setter)NULL, - Matrix_is_negative_doc, - NULL}, - {(char *)"is_orthogonal", + {"row", (getter)Matrix_row_get, (setter)NULL, Matrix_row_doc, NULL}, + {"col", (getter)Matrix_col_get, (setter)NULL, Matrix_col_doc, NULL}, + {"is_negative", (getter)Matrix_is_negative_get, (setter)NULL, Matrix_is_negative_doc, NULL}, + {"is_orthogonal", (getter)Matrix_is_orthogonal_get, (setter)NULL, Matrix_is_orthogonal_doc, NULL}, - {(char *)"is_orthogonal_axis_vectors", + {"is_orthogonal_axis_vectors", (getter)Matrix_is_orthogonal_axis_vectors_get, (setter)NULL, Matrix_is_orthogonal_axis_vectors_doc, NULL}, - {(char *)"is_wrapped", + {"is_wrapped", (getter)BaseMathObject_is_wrapped_get, (setter)NULL, BaseMathObject_is_wrapped_doc, NULL}, - {(char *)"is_frozen", + {"is_frozen", (getter)BaseMathObject_is_frozen_get, (setter)NULL, BaseMathObject_is_frozen_doc, NULL}, - {(char *)"owner", - (getter)BaseMathObject_owner_get, - (setter)NULL, - BaseMathObject_owner_doc, - NULL}, + {"owner", (getter)BaseMathObject_owner_get, (setter)NULL, BaseMathObject_owner_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/mathutils/mathutils_Quaternion.c b/source/blender/python/mathutils/mathutils_Quaternion.c index d7cccd5c352..ac7dd8590f2 100644 --- a/source/blender/python/mathutils/mathutils_Quaternion.c +++ b/source/blender/python/mathutils/mathutils_Quaternion.c @@ -1480,56 +1480,48 @@ static struct PyMethodDef Quaternion_methods[] = { /* Python attributes get/set structure: */ /*****************************************************************************/ static PyGetSetDef Quaternion_getseters[] = { - {(char *)"w", + {"w", (getter)Quaternion_axis_get, (setter)Quaternion_axis_set, Quaternion_axis_doc, (void *)0}, - {(char *)"x", + {"x", (getter)Quaternion_axis_get, (setter)Quaternion_axis_set, Quaternion_axis_doc, (void *)1}, - {(char *)"y", + {"y", (getter)Quaternion_axis_get, (setter)Quaternion_axis_set, Quaternion_axis_doc, (void *)2}, - {(char *)"z", + {"z", (getter)Quaternion_axis_get, (setter)Quaternion_axis_set, Quaternion_axis_doc, (void *)3}, - {(char *)"magnitude", - (getter)Quaternion_magnitude_get, - (setter)NULL, - Quaternion_magnitude_doc, - NULL}, - {(char *)"angle", + {"magnitude", (getter)Quaternion_magnitude_get, (setter)NULL, Quaternion_magnitude_doc, NULL}, + {"angle", (getter)Quaternion_angle_get, (setter)Quaternion_angle_set, Quaternion_angle_doc, NULL}, - {(char *)"axis", + {"axis", (getter)Quaternion_axis_vector_get, (setter)Quaternion_axis_vector_set, Quaternion_axis_vector_doc, NULL}, - {(char *)"is_wrapped", + {"is_wrapped", (getter)BaseMathObject_is_wrapped_get, (setter)NULL, BaseMathObject_is_wrapped_doc, NULL}, - {(char *)"is_frozen", + {"is_frozen", (getter)BaseMathObject_is_frozen_get, (setter)NULL, BaseMathObject_is_frozen_doc, NULL}, - {(char *)"owner", - (getter)BaseMathObject_owner_get, - (setter)NULL, - BaseMathObject_owner_doc, - NULL}, + {"owner", (getter)BaseMathObject_owner_get, (setter)NULL, BaseMathObject_owner_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/python/mathutils/mathutils_bvhtree.c b/source/blender/python/mathutils/mathutils_bvhtree.c index d28b9a0de8f..82f1d17fe52 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.c +++ b/source/blender/python/mathutils/mathutils_bvhtree.c @@ -349,7 +349,7 @@ static PyObject *py_bvhtree_ray_cast(PyBVHTree *self, PyObject *args) { PyObject *py_co, *py_direction; - if (!PyArg_ParseTuple(args, (char *)"OO|f:ray_cast", &py_co, &py_direction, &max_dist)) { + if (!PyArg_ParseTuple(args, "OO|f:ray_cast", &py_co, &py_direction, &max_dist)) { return NULL; } @@ -397,7 +397,7 @@ static PyObject *py_bvhtree_find_nearest(PyBVHTree *self, PyObject *args) { PyObject *py_co; - if (!PyArg_ParseTuple(args, (char *)"O|f:find_nearest", &py_co, &max_dist)) { + if (!PyArg_ParseTuple(args, "O|f:find_nearest", &py_co, &max_dist)) { return NULL; } @@ -478,7 +478,7 @@ static PyObject *py_bvhtree_find_nearest_range(PyBVHTree *self, PyObject *args) { PyObject *py_co; - if (!PyArg_ParseTuple(args, (char *)"O|f:find_nearest_range", &py_co, &max_dist)) { + if (!PyArg_ParseTuple(args, "O|f:find_nearest_range", &py_co, &max_dist)) { return NULL; } @@ -678,7 +678,7 @@ static PyObject *C_BVHTree_FromPolygons(PyObject *UNUSED(cls), PyObject *args, P if (!PyArg_ParseTupleAndKeywords(args, kwargs, - (char *)"OO|$O&f:BVHTree.FromPolygons", + "OO|$O&f:BVHTree.FromPolygons", (char **)keywords, &py_coords, &py_tris, @@ -951,7 +951,7 @@ static PyObject *C_BVHTree_FromBMesh(PyObject *UNUSED(cls), PyObject *args, PyOb if (!PyArg_ParseTupleAndKeywords(args, kwargs, - (char *)"O!|$f:BVHTree.FromBMesh", + "O!|$f:BVHTree.FromBMesh", (char **)keywords, &BPy_BMesh_Type, &py_bm, @@ -1142,7 +1142,7 @@ static PyObject *C_BVHTree_FromObject(PyObject *UNUSED(cls), PyObject *args, PyO if (!PyArg_ParseTupleAndKeywords(args, kwargs, - (char *)"OO|$O&O&f:BVHTree.FromObject", + "OO|$O&O&f:BVHTree.FromObject", (char **)keywords, &py_ob, &py_depsgraph, diff --git a/source/blender/python/mathutils/mathutils_kdtree.c b/source/blender/python/mathutils/mathutils_kdtree.c index e3f2cd9bd14..c6383f23d60 100644 --- a/source/blender/python/mathutils/mathutils_kdtree.c +++ b/source/blender/python/mathutils/mathutils_kdtree.c @@ -134,8 +134,7 @@ static PyObject *py_kdtree_insert(PyKDTree *self, PyObject *args, PyObject *kwar int index; const char *keywords[] = {"co", "index", NULL}; - if (!PyArg_ParseTupleAndKeywords( - args, kwargs, (char *)"Oi:insert", (char **)keywords, &py_co, &index)) { + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi:insert", (char **)keywords, &py_co, &index)) { return NULL; } @@ -223,7 +222,7 @@ static PyObject *py_kdtree_find(PyKDTree *self, PyObject *args, PyObject *kwargs const char *keywords[] = {"co", "filter", NULL}; if (!PyArg_ParseTupleAndKeywords( - args, kwargs, (char *)"O|O:find", (char **)keywords, &py_co, &py_filter)) { + args, kwargs, "O|O:find", (char **)keywords, &py_co, &py_filter)) { return NULL; } @@ -278,8 +277,7 @@ static PyObject *py_kdtree_find_n(PyKDTree *self, PyObject *args, PyObject *kwar int i, found; const char *keywords[] = {"co", "n", NULL}; - if (!PyArg_ParseTupleAndKeywords( - args, kwargs, (char *)"OI:find_n", (char **)keywords, &py_co, &n)) { + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OI:find_n", (char **)keywords, &py_co, &n)) { return NULL; } @@ -335,7 +333,7 @@ static PyObject *py_kdtree_find_range(PyKDTree *self, PyObject *args, PyObject * const char *keywords[] = {"co", "radius", NULL}; if (!PyArg_ParseTupleAndKeywords( - args, kwargs, (char *)"Of:find_range", (char **)keywords, &py_co, &radius)) { + args, kwargs, "Of:find_range", (char **)keywords, &py_co, &radius)) { return NULL; } |