From 8a61ea7296f17428f062a840c560e08a5a2f72ea Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 19 Jan 2019 13:21:18 +1100 Subject: Cleanup: add trailing commas Prevents clang-format merging into a single line. --- intern/cycles/blender/blender_python.cpp | 2 +- source/blender/blenkernel/intern/boids.c | 2 +- source/blender/blenkernel/intern/context.c | 2 +- source/blender/blenkernel/intern/idprop.c | 2 +- source/blender/blenkernel/intern/pointcache.c | 2 +- source/blender/blenlib/intern/math_interp.c | 2 +- source/blender/bmesh/operators/bmo_primitive.c | 2 +- source/blender/draw/engines/eevee/eevee_lut.h | 4 ++-- source/blender/editors/sound/sound_ops.c | 2 +- .../editors/space_buttons/buttons_context.c | 2 +- source/blender/editors/space_view3d/space_view3d.c | 2 +- source/blender/imbuf/intern/cineon/logImageCore.h | 6 +++--- source/blender/imbuf/intern/util.c | 8 ++++---- source/blender/makesrna/intern/rna_access.c | 4 ++-- source/blender/makesrna/intern/rna_nodetree.c | 8 ++++---- source/blender/modifiers/intern/MOD_smoke.c | 2 +- .../nodes/node_composite_doubleEdgeMask.c | 2 +- source/blender/python/bmesh/bmesh_py_ops.c | 4 ++-- .../blender/python/bmesh/bmesh_py_types_meshdata.c | 4 ++-- source/blender/python/generic/bgl.c | 2 +- source/blender/python/generic/idprop_py_api.c | 4 ++-- source/blender/python/intern/bpy_app_icons.c | 2 +- source/blender/python/intern/bpy_app_ocio.c | 2 +- .../blender/python/intern/bpy_app_translations.c | 2 +- source/blender/python/intern/bpy_library_load.c | 2 +- source/blender/python/intern/bpy_msgbus.c | 2 +- source/blender/python/intern/bpy_operator.c | 2 +- source/blender/python/intern/bpy_props.c | 2 +- source/blender/python/intern/bpy_rna.c | 24 +++++++++++----------- source/blender/python/intern/bpy_utils_previews.c | 2 +- source/blender/python/intern/bpy_utils_units.c | 4 ++-- source/blender/python/mathutils/mathutils_Color.c | 2 +- source/blender/python/mathutils/mathutils_Euler.c | 2 +- source/blender/python/mathutils/mathutils_Matrix.c | 10 ++++----- .../python/mathutils/mathutils_Quaternion.c | 2 +- source/blender/python/mathutils/mathutils_Vector.c | 4 ++-- .../python/mathutils/mathutils_interpolate.c | 2 +- source/blender/python/mathutils/mathutils_kdtree.c | 2 +- source/blender/python/mathutils/mathutils_noise.c | 6 +++--- source/blender/windowmanager/intern/wm_operators.c | 4 ++-- 40 files changed, 73 insertions(+), 73 deletions(-) diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 69f2f9b853f..bf5c2432bc7 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -801,7 +801,7 @@ static struct PyModuleDef module = { "Blender cycles render integration", -1, methods, - NULL, NULL, NULL, NULL + NULL, NULL, NULL, NULL, }; CCL_NAMESPACE_END diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index ea62748806c..343237fc631 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -743,7 +743,7 @@ static boid_rule_cb boid_rules[] = { //rule_protect, //rule_hide, //rule_follow_path, - //rule_follow_wall + //rule_follow_wall, }; static void set_boid_values(BoidValues *val, BoidSettings *boids, ParticleData *pa) diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 1fb8af59c55..cff1d1a8947 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -1045,7 +1045,7 @@ static const char *data_mode_strings[] = { "greasepencil_edit", "greasepencil_sculpt", "greasepencil_weight", - NULL + NULL, }; BLI_STATIC_ASSERT(ARRAY_SIZE(data_mode_strings) == CTX_MODE_NUM + 1, "Must have a string for each context mode") const char *CTX_data_mode_string(const bContext *C) diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 5ea9f9b20f9..4d6c43c34e0 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -62,7 +62,7 @@ static size_t idp_size_table[] = { 0, /*arrays don't have a fixed size*/ sizeof(ListBase), /*Group type*/ sizeof(void *), - sizeof(double) + sizeof(double), }; diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 9f9f4703123..3bf8d5aaa1e 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -137,7 +137,7 @@ static int ptcache_data_size[] = { static int ptcache_extra_datasize[] = { 0, - sizeof(ParticleSpring) + sizeof(ParticleSpring), }; /* forward declarations */ diff --git a/source/blender/blenlib/intern/math_interp.c b/source/blender/blenlib/intern/math_interp.c index a432cfad1fc..27b26ede793 100644 --- a/source/blender/blenlib/intern/math_interp.c +++ b/source/blender/blenlib/intern/math_interp.c @@ -455,7 +455,7 @@ const float EWA_WTS[EWA_MAXIDX + 1] = { 0.0415211f, 0.039974f, 0.0384389f, 0.0369158f, 0.0354046f, 0.0339052f, 0.0324175f, 0.0309415f, 0.029477f, 0.0280239f, 0.0265822f, 0.0251517f, 0.0237324f, 0.0223242f, 0.020927f, 0.0195408f, 0.0181653f, 0.0168006f, 0.0154466f, 0.0141031f, 0.0127701f, 0.0114476f, 0.0101354f, 0.00883339f, - 0.00754159f, 0.00625989f, 0.00498819f, 0.00372644f, 0.00247454f, 0.00123242f, 0.f + 0.00754159f, 0.00625989f, 0.00498819f, 0.00372644f, 0.00247454f, 0.00123242f, 0.f, }; static void radangle2imp(float a2, float b2, float th, float *A, float *B, float *C, float *F) diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c index b4f41790a81..5809b543210 100644 --- a/source/blender/bmesh/operators/bmo_primitive.c +++ b/source/blender/bmesh/operators/bmo_primitive.c @@ -744,7 +744,7 @@ static const float monkeyuvs[] = 0.620420f, 0.565675f, 0.671403f, 0.592656f, 0.484068f, 0.628776f, 0.498072f, 0.552315f, 0.276936f, 0.625067f, 0.092820f, 0.589862f, 0.145041f, 0.562595f, 0.264218f, 0.550140f, 0.391039f, 0.611891f, 0.498072f, 0.552315f, 0.484068f, 0.628776f, 0.434803f, 0.658882f, - 0.276936f, 0.625067f, 0.264218f, 0.550140f, 0.369913f, 0.610196f, 0.325318f, 0.656224f + 0.276936f, 0.625067f, 0.264218f, 0.550140f, 0.369913f, 0.610196f, 0.325318f, 0.656224f, }; #define VERT_MARK 1 diff --git a/source/blender/draw/engines/eevee/eevee_lut.h b/source/blender/draw/engines/eevee/eevee_lut.h index da765b3e53a..626f653ea40 100644 --- a/source/blender/draw/engines/eevee/eevee_lut.h +++ b/source/blender/draw/engines/eevee/eevee_lut.h @@ -3342,7 +3342,7 @@ static float bsdf_split_sum_ggx[64 * 64 * 2] = { 0.731445f, 0.049774f, 0.725586f, 0.046661f, 0.718262f, 0.043732f, 0.710449f, 0.041077f, 0.702637f, 0.038544f, 0.694336f, 0.036163f, 0.685547f, 0.033966f, 0.676758f, 0.031921f, 0.667480f, 0.030014f, 0.657715f, 0.028229f, 0.647461f, 0.026566f, 0.637207f, 0.025009f, - 0.626953f, 0.023544f, 0.616699f, 0.022186f, 0.605957f, 0.020920f, 0.594727f, 0.019730f + 0.626953f, 0.023544f, 0.616699f, 0.022186f, 0.605957f, 0.020920f, 0.594727f, 0.019730f, }; static float ltc_disk_integral[64 * 64] = { @@ -3857,7 +3857,7 @@ static float ltc_disk_integral[64 * 64] = { 0.507937f, 0.523810f, 0.539683f, 0.555556f, 0.571429f, 0.587302f, 0.603175f, 0.619048f, 0.634921f, 0.650794f, 0.666667f, 0.682540f, 0.698413f, 0.714286f, 0.730159f, 0.746032f, 0.761905f, 0.777778f, 0.793651f, 0.809524f, 0.825397f, 0.841270f, 0.857143f, 0.873016f, - 0.888889f, 0.904762f, 0.920635f, 0.936508f, 0.952381f, 0.968254f, 0.984127f, 1.000000f + 0.888889f, 0.904762f, 0.920635f, 0.936508f, 0.952381f, 0.968254f, 0.984127f, 1.000000f, }; static float btdf_split_sum_ggx[32][64 * 64] = { diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 558cab760e0..335f84bfde9 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -420,7 +420,7 @@ static const char *snd_ext_sound[] = { ".mp3", ".ogg", ".wav", - NULL + NULL, }; static bool sound_mixdown_check(bContext *UNUSED(C), wmOperator *op) diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 041b7277c8c..72457ce079c 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -711,7 +711,7 @@ const char *buttons_context_dir[] = { "texture", "texture_user", "texture_user_property", "bone", "edit_bone", "pose_bone", "particle_system", "particle_system_editable", "particle_settings", "cloth", "soft_body", "fluid", "smoke", "collision", "brush", "dynamic_paint", - "line_style", "collection", NULL + "line_style", "collection", NULL, }; int buttons_context(const bContext *C, const char *member, bContextDataResult *result) diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 7b3d1ac6072..9ad35fe9fc6 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1364,7 +1364,7 @@ static void space_view3d_refresh(const bContext *C, ScrArea *UNUSED(sa)) } const char *view3d_context_dir[] = { - "active_base", "active_object", NULL + "active_base", "active_object", NULL, }; static int view3d_context(const bContext *C, const char *member, bContextDataResult *result) diff --git a/source/blender/imbuf/intern/cineon/logImageCore.h b/source/blender/imbuf/intern/cineon/logImageCore.h index b6f4fff73f6..f696d1b44d8 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.h +++ b/source/blender/imbuf/intern/cineon/logImageCore.h @@ -49,7 +49,7 @@ extern "C" { /* There are some differences between DPX and Cineon so we need to know from what type of file the datas come from */ enum format { format_DPX, - format_Cineon + format_Cineon, }; typedef struct LogImageElement { @@ -125,7 +125,7 @@ enum transfer { transfer_NTSC, transfer_PAL, transfer_ZLinear, - transfer_Homogeneous + transfer_Homogeneous, }; /* The SMPTE defines this code: @@ -179,7 +179,7 @@ enum descriptor { descriptor_UserDefined7Elt, descriptor_UserDefined8Elt, /* following descriptors are for internal use only */ - descriptor_YA + descriptor_YA, }; /* int functions return 0 for OK */ diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 6a095b2da1f..38591adbaa2 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -92,14 +92,14 @@ const char *imb_ext_image[] = { #ifdef WITH_OPENIMAGEIO ".psd", ".pdd", ".psb", #endif - NULL + NULL, }; const char *imb_ext_image_filepath_only[] = { #ifdef WITH_OPENIMAGEIO ".psd", ".pdd", ".psb", #endif - NULL + NULL, }; const char *imb_ext_movie[] = { @@ -131,7 +131,7 @@ const char *imb_ext_movie[] = { ".xvid", ".mxf", ".webm", - NULL + NULL, }; /* sort of wrong being here... */ @@ -150,7 +150,7 @@ const char *imb_ext_audio[] = { ".aiff", ".m4a", ".mka", - NULL + NULL, }; int IMB_ispic_type(const char *name) diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index b1f9cfc2bc9..c159d4d9daa 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -523,7 +523,7 @@ static PropertyRNA *typemap[IDP_NUMTYPES] = { (PropertyRNA *)&rna_PropertyGroupItem_group, (PropertyRNA *)&rna_PropertyGroupItem_id, (PropertyRNA *)&rna_PropertyGroupItem_double, - (PropertyRNA *)&rna_PropertyGroupItem_idp_array + (PropertyRNA *)&rna_PropertyGroupItem_idp_array, }; static PropertyRNA *arraytypemap[IDP_NUMTYPES] = { @@ -531,7 +531,7 @@ static PropertyRNA *arraytypemap[IDP_NUMTYPES] = { (PropertyRNA *)&rna_PropertyGroupItem_float_array, NULL, NULL, NULL, (PropertyRNA *)&rna_PropertyGroupItem_collection, NULL, - (PropertyRNA *)&rna_PropertyGroupItem_double_array + (PropertyRNA *)&rna_PropertyGroupItem_double_array, }; static void *rna_idproperty_check_ex(PropertyRNA **prop, PointerRNA *ptr, const bool return_rnaprop) diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 6dd243087c4..422ef9d61e8 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -3314,26 +3314,26 @@ static const EnumPropertyItem node_glass_items[] = { {SHD_GLOSSY_BECKMANN, "BECKMANN", 0, "Beckmann", ""}, {SHD_GLOSSY_GGX, "GGX", 0, "GGX", ""}, {SHD_GLOSSY_MULTI_GGX, "MULTI_GGX", 0, "Multiscatter GGX", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_refraction_items[] = { {SHD_GLOSSY_SHARP, "SHARP", 0, "Sharp", ""}, {SHD_GLOSSY_BECKMANN, "BECKMANN", 0, "Beckmann", ""}, {SHD_GLOSSY_GGX, "GGX", 0, "GGX", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_toon_items[] = { {SHD_TOON_DIFFUSE, "DIFFUSE", 0, "Diffuse", ""}, {SHD_TOON_GLOSSY, "GLOSSY", 0, "Glossy", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_hair_items[] = { {SHD_HAIR_REFLECTION, "Reflection", 0, "Reflection", ""}, {SHD_HAIR_TRANSMISSION, "Transmission", 0, "Transmission", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_principled_hair_items[] = { diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index d0db852550b..8fac27272b0 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -201,5 +201,5 @@ ModifierTypeInfo modifierType_Smoke = { /* dependsOnNormals */ NULL, /* foreachObjectLink */ NULL, /* foreachIDLink */ foreachIDLink, - /* foreachTexLink */ NULL + /* foreachTexLink */ NULL, }; diff --git a/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c b/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c index 699dfce2243..0a145ff3ba9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c +++ b/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c @@ -35,7 +35,7 @@ static bNodeSocketTemplate cmp_node_doubleedgemask_in[] = { { SOCK_FLOAT, 1, "Inner Mask", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f, PROP_NONE}, // inner mask socket definition { SOCK_FLOAT, 1, "Outer Mask", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f, PROP_NONE}, // outer mask socket definition - { -1, 0, "" } // input socket array terminator + { -1, 0, "" }, // input socket array terminator }; static bNodeSocketTemplate cmp_node_doubleedgemask_out[] = { { SOCK_FLOAT, 0, "Mask"}, // output socket definition diff --git a/source/blender/python/bmesh/bmesh_py_ops.c b/source/blender/python/bmesh/bmesh_py_ops.c index 49e71da3bc3..3a4437b2be6 100644 --- a/source/blender/python/bmesh/bmesh_py_ops.c +++ b/source/blender/python/bmesh/bmesh_py_ops.c @@ -232,7 +232,7 @@ static PyTypeObject bmesh_op_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; @@ -350,7 +350,7 @@ static PyTypeObject bmesh_ops_fakemod_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; PyObject *BPyInit_bmesh_ops(void) diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 2a0f3817f35..45092e854ed 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -334,7 +334,7 @@ static Mathutils_Callback mathutils_bmloopcol_cb = { mathutils_bmloopcol_get, mathutils_bmloopcol_set, mathutils_bmloopcol_get_index, - mathutils_bmloopcol_set_index + mathutils_bmloopcol_set_index, }; static void bm_init_types_bmloopcol(void) @@ -523,7 +523,7 @@ static PySequenceMethods bpy_bmdeformvert_as_sequence = { static PyMappingMethods bpy_bmdeformvert_as_mapping = { (lenfunc)bpy_bmdeformvert_len, (binaryfunc)bpy_bmdeformvert_subscript, - (objobjargproc)bpy_bmdeformvert_ass_subscript + (objobjargproc)bpy_bmdeformvert_ass_subscript, }; /* Methods diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c index 07c0f81b7ca..ad30b5ceb2a 100644 --- a/source/blender/python/generic/bgl.c +++ b/source/blender/python/generic/bgl.c @@ -533,7 +533,7 @@ static PySequenceMethods Buffer_SeqMethods = { static PyMappingMethods Buffer_AsMapping = { (lenfunc)Buffer_len, (binaryfunc)Buffer_subscript, - (objobjargproc)Buffer_ass_subscript + (objobjargproc)Buffer_ass_subscript, }; static void Buffer_dealloc(Buffer *self); diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index 072c11b14e5..d6e4a3ac291 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -1520,7 +1520,7 @@ static int BPy_IDArray_ass_subscript(BPy_IDArray *self, PyObject *item, PyObject static PyMappingMethods BPy_IDArray_AsMapping = { (lenfunc)BPy_IDArray_Len, (binaryfunc)BPy_IDArray_subscript, - (objobjargproc)BPy_IDArray_ass_subscript + (objobjargproc)BPy_IDArray_ass_subscript, }; static int itemsize_by_idarray_type(int array_type) @@ -1640,7 +1640,7 @@ PyTypeObject BPy_IDArray_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; /*********** ID Property Group iterator ********/ diff --git a/source/blender/python/intern/bpy_app_icons.c b/source/blender/python/intern/bpy_app_icons.c index 12315a6e112..075e2f57ec4 100644 --- a/source/blender/python/intern/bpy_app_icons.c +++ b/source/blender/python/intern/bpy_app_icons.c @@ -160,7 +160,7 @@ static struct PyMethodDef M_AppIcons_methods[] = { METH_VARARGS | METH_KEYWORDS, bpy_app_icons_new_triangles_from_file_doc}, {"release", (PyCFunction)bpy_app_icons_release, METH_VARARGS | METH_KEYWORDS, bpy_app_icons_release_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; static struct PyModuleDef M_AppIcons_module_def = { diff --git a/source/blender/python/intern/bpy_app_ocio.c b/source/blender/python/intern/bpy_app_ocio.c index 9997e6b87f1..546261f82fa 100644 --- a/source/blender/python/intern/bpy_app_ocio.c +++ b/source/blender/python/intern/bpy_app_ocio.c @@ -41,7 +41,7 @@ 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")}, - {NULL} + {NULL}, }; static PyStructSequence_Desc app_ocio_info_desc = { diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index 2a5efc15b87..acb44f86f75 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -782,7 +782,7 @@ static PyTypeObject BlenderAppTranslationsType = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; PyObject *BPY_app_translations_struct(void) diff --git a/source/blender/python/intern/bpy_library_load.c b/source/blender/python/intern/bpy_library_load.c index 5c64a65fb58..b44e269e2c3 100644 --- a/source/blender/python/intern/bpy_library_load.c +++ b/source/blender/python/intern/bpy_library_load.c @@ -167,7 +167,7 @@ static PyTypeObject bpy_lib_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; PyDoc_STRVAR(bpy_lib_load_doc, diff --git a/source/blender/python/intern/bpy_msgbus.c b/source/blender/python/intern/bpy_msgbus.c index 101cc8b41a3..a1713bd7aae 100644 --- a/source/blender/python/intern/bpy_msgbus.c +++ b/source/blender/python/intern/bpy_msgbus.c @@ -377,7 +377,7 @@ static struct PyMethodDef BPy_msgbus_methods[] = { {"subscribe_rna", (PyCFunction)bpy_msgbus_subscribe_rna, METH_VARARGS | METH_KEYWORDS, bpy_msgbus_subscribe_rna_doc}, {"publish_rna", (PyCFunction)bpy_msgbus_publish_rna, METH_VARARGS | METH_KEYWORDS, bpy_msgbus_publish_rna_doc}, {"clear_by_owner", (PyCFunction)bpy_msgbus_clear_by_owner, METH_O, bpy_msgbus_clear_by_owner_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; static struct PyModuleDef _bpy_msgbus_def = { diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index d3abaf43aef..56db0a604aa 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -438,7 +438,7 @@ static struct PyModuleDef bpy_ops_module = { NULL, -1, /* multiple "initialization" just copies the module dict. */ bpy_ops_methods, - NULL, NULL, NULL, NULL + NULL, NULL, NULL, NULL, }; PyObject *BPY_operator_module(void) diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index b7242680dca..206929a4271 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -3193,7 +3193,7 @@ static struct PyModuleDef props_module = { ".. note:: All parameters to these functions must be passed as keywords.\n", -1, /* multiple "initialization" just copies the module dict. */ props_methods, - NULL, NULL, NULL, NULL + NULL, NULL, NULL, NULL, }; PyObject *BPY_rna_props(void) diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index f25f007033f..0b89a6eaa55 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -513,7 +513,7 @@ static Mathutils_Callback mathutils_rna_array_cb = { (BaseMathGetFunc) mathutils_rna_vector_get, (BaseMathSetFunc) mathutils_rna_vector_set, (BaseMathGetIndexFunc) mathutils_rna_vector_get_index, - (BaseMathSetIndexFunc) mathutils_rna_vector_set_index + (BaseMathSetIndexFunc) mathutils_rna_vector_set_index, }; @@ -569,7 +569,7 @@ static Mathutils_Callback mathutils_rna_matrix_cb = { mathutils_rna_matrix_get, mathutils_rna_matrix_set, NULL, - NULL + NULL, }; static short pyrna_rotation_euler_order_get( @@ -5277,7 +5277,7 @@ static struct PyMethodDef pyrna_prop_methods[] = { }; static struct PyMethodDef pyrna_prop_array_methods[] = { - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; static struct PyMethodDef pyrna_prop_collection_methods[] = { @@ -5977,7 +5977,7 @@ PyTypeObject pyrna_struct_meta_idprop_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; @@ -6067,7 +6067,7 @@ PyTypeObject pyrna_struct_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; /*-----------------------BPy_PropertyRNA method def------------------------------*/ @@ -6152,7 +6152,7 @@ PyTypeObject pyrna_prop_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; PyTypeObject pyrna_prop_array_Type = { @@ -6235,7 +6235,7 @@ PyTypeObject pyrna_prop_array_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; PyTypeObject pyrna_prop_collection_Type = { @@ -6319,7 +6319,7 @@ PyTypeObject pyrna_prop_collection_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; /* only for add/remove/move methods */ @@ -6404,7 +6404,7 @@ static PyTypeObject pyrna_prop_collection_idprop_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; /*-----------------------BPy_PropertyRNA method def------------------------------*/ @@ -6489,7 +6489,7 @@ PyTypeObject pyrna_func_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; #ifdef USE_PYRNA_ITER @@ -6592,7 +6592,7 @@ static PyTypeObject pyrna_prop_collection_iter_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; static PyObject *pyrna_prop_collection_iter_CreatePyObject(PointerRNA *ptr, PropertyRNA *prop) @@ -8312,7 +8312,7 @@ PyDoc_STRVAR(pyrna_unregister_class_doc, " before unregistering.\n" ); PyMethodDef meth_bpy_unregister_class = { - "unregister_class", pyrna_unregister_class, METH_O, pyrna_unregister_class_doc + "unregister_class", pyrna_unregister_class, METH_O, pyrna_unregister_class_doc, }; static PyObject *pyrna_unregister_class(PyObject *UNUSED(self), PyObject *py_class) { diff --git a/source/blender/python/intern/bpy_utils_previews.c b/source/blender/python/intern/bpy_utils_previews.c index fed7c7210de..4734da4b1be 100644 --- a/source/blender/python/intern/bpy_utils_previews.c +++ b/source/blender/python/intern/bpy_utils_previews.c @@ -174,7 +174,7 @@ static struct PyModuleDef bpy_utils_previews_module = { bpy_utils_previews_doc, 0, bpy_utils_previews_methods, - NULL, NULL, NULL, NULL + NULL, NULL, NULL, NULL, }; diff --git a/source/blender/python/intern/bpy_utils_units.c b/source/blender/python/intern/bpy_utils_units.c index 1d1108e1af0..5a8b8606f74 100644 --- a/source/blender/python/intern/bpy_utils_units.c +++ b/source/blender/python/intern/bpy_utils_units.c @@ -301,7 +301,7 @@ static PyObject *bpyunits_to_string(PyObject *UNUSED(self), PyObject *args, PyOb static PyMethodDef bpyunits_methods[] = { {"to_value", (PyCFunction)bpyunits_to_value, METH_VARARGS | METH_KEYWORDS, bpyunits_to_value_doc}, {"to_string", (PyCFunction)bpyunits_to_string, METH_VARARGS | METH_KEYWORDS, bpyunits_to_string_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; PyDoc_STRVAR(bpyunits_doc, @@ -314,7 +314,7 @@ static struct PyModuleDef bpyunits_module = { bpyunits_doc, -1, /* multiple "initialization" just copies the module dict. */ bpyunits_methods, - NULL, NULL, NULL, NULL + NULL, NULL, NULL, NULL, }; PyObject *BPY_utils_units(void) diff --git a/source/blender/python/mathutils/mathutils_Color.c b/source/blender/python/mathutils/mathutils_Color.c index e97ed095b24..be7889da0bd 100644 --- a/source/blender/python/mathutils/mathutils_Color.c +++ b/source/blender/python/mathutils/mathutils_Color.c @@ -403,7 +403,7 @@ static PySequenceMethods Color_SeqMethods = { static PyMappingMethods Color_AsMapping = { (lenfunc)Color_len, (binaryfunc)Color_subscript, - (objobjargproc)Color_ass_subscript + (objobjargproc)Color_ass_subscript, }; /* numeric */ diff --git a/source/blender/python/mathutils/mathutils_Euler.c b/source/blender/python/mathutils/mathutils_Euler.c index 9046bdc1aa4..991314c23a4 100644 --- a/source/blender/python/mathutils/mathutils_Euler.c +++ b/source/blender/python/mathutils/mathutils_Euler.c @@ -602,7 +602,7 @@ static PySequenceMethods Euler_SeqMethods = { static PyMappingMethods Euler_AsMapping = { (lenfunc)Euler_len, (binaryfunc)Euler_subscript, - (objobjargproc)Euler_ass_subscript + (objobjargproc)Euler_ass_subscript, }; /* euler axis, euler.x/y/z */ diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c index c033a990901..04d4fb53895 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.c +++ b/source/blender/python/mathutils/mathutils_Matrix.c @@ -158,7 +158,7 @@ Mathutils_Callback mathutils_matrix_row_cb = { mathutils_matrix_row_get, mathutils_matrix_row_set, mathutils_matrix_row_get_index, - mathutils_matrix_row_set_index + mathutils_matrix_row_set_index, }; @@ -250,7 +250,7 @@ Mathutils_Callback mathutils_matrix_col_cb = { mathutils_matrix_col_get, mathutils_matrix_col_set, mathutils_matrix_col_get_index, - mathutils_matrix_col_set_index + mathutils_matrix_col_set_index, }; @@ -327,7 +327,7 @@ Mathutils_Callback mathutils_matrix_translation_cb = { mathutils_matrix_translation_get, mathutils_matrix_translation_set, mathutils_matrix_translation_get_index, - mathutils_matrix_translation_set_index + mathutils_matrix_translation_set_index, }; @@ -2652,7 +2652,7 @@ static int Matrix_ass_subscript(MatrixObject *self, PyObject *item, PyObject *va static PyMappingMethods Matrix_AsMapping = { (lenfunc)Matrix_len, (binaryfunc)Matrix_subscript, - (objobjargproc)Matrix_ass_subscript + (objobjargproc)Matrix_ass_subscript, }; @@ -3314,7 +3314,7 @@ static PyObject *MatrixAccess_iter(MatrixAccessObject *self) static PyMappingMethods MatrixAccess_AsMapping = { (lenfunc)MatrixAccess_len, (binaryfunc)MatrixAccess_subscript, - (objobjargproc) MatrixAccess_ass_subscript + (objobjargproc) MatrixAccess_ass_subscript, }; PyTypeObject matrix_access_Type = { diff --git a/source/blender/python/mathutils/mathutils_Quaternion.c b/source/blender/python/mathutils/mathutils_Quaternion.c index a2b4480584a..c892dce39e1 100644 --- a/source/blender/python/mathutils/mathutils_Quaternion.c +++ b/source/blender/python/mathutils/mathutils_Quaternion.c @@ -1036,7 +1036,7 @@ static PySequenceMethods Quaternion_SeqMethods = { static PyMappingMethods Quaternion_AsMapping = { (lenfunc)Quaternion_len, (binaryfunc)Quaternion_subscript, - (objobjargproc)Quaternion_ass_subscript + (objobjargproc)Quaternion_ass_subscript, }; static PyNumberMethods Quaternion_NumMethods = { diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c index 16a242fc718..77686f99042 100644 --- a/source/blender/python/mathutils/mathutils_Vector.c +++ b/source/blender/python/mathutils/mathutils_Vector.c @@ -2170,7 +2170,7 @@ static int Vector_ass_subscript(VectorObject *self, PyObject *item, PyObject *va static PyMappingMethods Vector_AsMapping = { (lenfunc)Vector_len, (binaryfunc)Vector_subscript, - (objobjargproc)Vector_ass_subscript + (objobjargproc)Vector_ass_subscript, }; @@ -3064,7 +3064,7 @@ PyTypeObject vector_Type = { NULL, /* PyObject *tp_cache; */ NULL, /* PyObject *tp_subclasses; */ NULL, /* PyObject *tp_weaklist; */ - NULL + NULL, }; PyObject *Vector_CreatePyObject( diff --git a/source/blender/python/mathutils/mathutils_interpolate.c b/source/blender/python/mathutils/mathutils_interpolate.c index 720fac7c276..d2a09aaccb2 100644 --- a/source/blender/python/mathutils/mathutils_interpolate.c +++ b/source/blender/python/mathutils/mathutils_interpolate.c @@ -115,7 +115,7 @@ static PyMethodDef M_Interpolate_methods[] = { #ifndef MATH_STANDALONE {"poly_3d_calc", (PyCFunction) M_Interpolate_poly_3d_calc, METH_VARARGS, M_Interpolate_poly_3d_calc_doc}, #endif - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; static struct PyModuleDef M_Interpolate_module_def = { diff --git a/source/blender/python/mathutils/mathutils_kdtree.c b/source/blender/python/mathutils/mathutils_kdtree.c index ca66c1906b4..6405aee0496 100644 --- a/source/blender/python/mathutils/mathutils_kdtree.c +++ b/source/blender/python/mathutils/mathutils_kdtree.c @@ -398,7 +398,7 @@ static PyMethodDef PyKDTree_methods[] = { {"find", (PyCFunction)py_kdtree_find, METH_VARARGS | METH_KEYWORDS, py_kdtree_find_doc}, {"find_n", (PyCFunction)py_kdtree_find_n, METH_VARARGS | METH_KEYWORDS, py_kdtree_find_n_doc}, {"find_range", (PyCFunction)py_kdtree_find_range, METH_VARARGS | METH_KEYWORDS, py_kdtree_find_range_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; PyDoc_STRVAR(py_KDtree_doc, diff --git a/source/blender/python/mathutils/mathutils_noise.c b/source/blender/python/mathutils/mathutils_noise.c index 5e3e86c8ddf..fd41ff360cb 100644 --- a/source/blender/python/mathutils/mathutils_noise.c +++ b/source/blender/python/mathutils/mathutils_noise.c @@ -216,7 +216,7 @@ static PyC_FlagSet bpy_noise_types[] = { {TEX_VORONOI_F2F1, "VORONOI_F2F1"}, {TEX_VORONOI_CRACKLE, "VORONOI_CRACKLE"}, {TEX_CELLNOISE, "CELLNOISE"}, - {0, NULL} + {0, NULL}, }; /* Metric basis enum */ @@ -230,7 +230,7 @@ static PyC_FlagSet bpy_noise_metrics[] = { {TEX_MINKOVSKY, "MINKOVSKY"}, {TEX_MINKOVSKY_HALF, "MINKOVSKY_HALF"}, {TEX_MINKOVSKY_FOUR, "MINKOVSKY_FOUR"}, - {0, NULL} + {0, NULL}, }; /* Fills an array of length size with random numbers in the range (-1, 1)*/ @@ -1044,7 +1044,7 @@ static PyMethodDef M_Noise_methods[] = { {"voronoi", (PyCFunction) M_Noise_voronoi, METH_VARARGS | METH_KEYWORDS, M_Noise_voronoi_doc}, {"cell", (PyCFunction) M_Noise_cell, METH_VARARGS, M_Noise_cell_doc}, {"cell_vector", (PyCFunction) M_Noise_cell_vector, METH_VARARGS, M_Noise_cell_vector_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; static struct PyModuleDef M_Noise_module_def = { diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 60a26cc2f77..23ce13722fb 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2797,7 +2797,7 @@ static const EnumPropertyItem redraw_timer_type_items[] = { {eRTAnimationStep, "ANIM_STEP", 0, "Anim Step", "Animation Steps"}, {eRTAnimationPlay, "ANIM_PLAY", 0, "Anim Play", "Animation Playback"}, {eRTUndo, "UNDO", 0, "Undo/Redo", "Undo/Redo"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -3050,7 +3050,7 @@ static const EnumPropertyItem preview_id_type_items[] = { #if 0 /* XXX TODO */ {FILTER_ID_BR, "BRUSH", 0, "Brushes", ""}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static int previews_clear_exec(bContext *C, wmOperator *op) -- cgit v1.2.3