Commit: 8a61ea7296f17428f062a840c560e08a5a2f72ea
Author: Campbell Barton
Date: Sat Jan 19 13:21:18 2019 +1100
Branches: master
https://developer.blender.org/rB8a61ea7296f17428f062a840c560e08a5a2f72ea
Cleanup: add trailing commas
Prevents clang-format merging into a single line.
===================================================================
M intern/cycles/blender/blender_python.cpp
M source/blender/blenkernel/intern/boids.c
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/idprop.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenlib/intern/math_interp.c
M source/blender/bmesh/operators/bmo_primitive.c
M source/blender/draw/engines/eevee/eevee_lut.h
M source/blender/editors/sound/sound_ops.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/imbuf/intern/cineon/logImageCore.h
M source/blender/imbuf/intern/util.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/modifiers/intern/MOD_smoke.c
M source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
M source/blender/python/bmesh/bmesh_py_ops.c
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
M source/blender/python/generic/bgl.c
M source/blender/python/generic/idprop_py_api.c
M source/blender/python/intern/bpy_app_icons.c
M source/blender/python/intern/bpy_app_ocio.c
M source/blender/python/intern/bpy_app_translations.c
M source/blender/python/intern/bpy_library_load.c
M source/blender/python/intern/bpy_msgbus.c
M source/blender/python/intern/bpy_operator.c
M source/blender/python/intern/bpy_props.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/intern/bpy_utils_previews.c
M source/blender/python/intern/bpy_utils_units.c
M source/blender/python/mathutils/mathutils_Color.c
M source/blender/python/mathutils/mathutils_Euler.c
M source/blender/python/mathutils/mathutils_Matrix.c
M source/blender/python/mathutils/mathutils_Quaternion.c
M source/blender/python/mathutils/mathutils_Vector.c
M source/blender/python/mathutils/mathutils_interpolate.c
M source/blender/python/mathutils/mathutils_kdtree.c
M source/blender/python/mathutils/mathutils_noise.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
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,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
