[Bf-blender-cvs] [e305560f13c] master: Cleanup: add trailing commas to structs
Campbell Barton
noreply at git.blender.org
Sun Jan 6 14:36:31 CET 2019
Commit: e305560f13c3c67b048dc3889c7797eae2e345c4
Author: Campbell Barton
Date: Mon Jan 7 00:06:58 2019 +1100
Branches: master
https://developer.blender.org/rBe305560f13c3c67b048dc3889c7797eae2e345c4
Cleanup: add trailing commas to structs
Needed for clang formatting to workaround bug/limit, see: T53211
===================================================================
M source/blender/blenfont/intern/blf_glyph.c
M source/blender/blenkernel/intern/CCGSubSurf_legacy.c
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/collision.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/keyconfig.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/mask_rasterize.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/multires.c
M source/blender/blenkernel/intern/multires_reshape.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenkernel/intern/subdiv_ccg.c
M source/blender/blenkernel/intern/tracking_stabilize.c
M source/blender/bmesh/intern/bmesh_interp.c
M source/blender/bmesh/intern/bmesh_mesh.c
M source/blender/draw/engines/eevee/eevee_lightcache.c
M source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/engines/eevee/eevee_lights.c
M source/blender/editors/armature/armature_select.c
M source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
M source/blender/editors/interface/interface_draw.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/screen/screen_draw.c
M source/blender/editors/space_nla/nla_draw.c
M source/blender/editors/space_outliner/outliner_collections.c
M source/blender/editors/space_sequencer/sequencer_scopes.c
M source/blender/editors/space_view3d/view3d_draw_legacy.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/gpu/intern/gpu_draw.c
M source/blender/gpu/intern/gpu_matrix.c
M source/blender/gpu/intern/gpu_vertex_format.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_workspace.c
M source/blender/modifiers/intern/MOD_surfacedeform.c
M source/blender/modifiers/intern/MOD_uvwarp.c
M source/blender/nodes/shader/node_shader_tree.c
M source/creator/creator.c
===================================================================
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index 8fcba1fc2af..d223afa2ede 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -100,7 +100,7 @@ KerningCacheBLF *blf_kerning_cache_new(FontBLF *font)
/* Cannot fail since it has been added just before. */
GlyphBLF *g_prev = blf_glyph_search(font->glyph_cache, j);
- FT_Vector delta = {.x = 0, .y = 0};
+ FT_Vector delta = { .x = 0, .y = 0, };
if (FT_Get_Kerning(font->face, g_prev->idx, g->idx, kc->mode, &delta) == 0) {
kc->table[i][j] = (int)delta.x >> 6;
}
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c
index 756935b50ba..dd0e29cccc9 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c
+++ b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c
@@ -334,7 +334,7 @@ static void ccgSubSurf__calcVertNormals(CCGSubSurf *ss,
.effectedF = effectedF,
.numEffectedV = numEffectedV,
.numEffectedE = numEffectedE,
- .numEffectedF = numEffectedF
+ .numEffectedF = numEffectedF,
};
{
@@ -677,7 +677,7 @@ static void ccgSubSurf__calcSubdivLevel(
.numEffectedV = numEffectedV,
.numEffectedE = numEffectedE,
.numEffectedF = numEffectedF,
- .curLvl = curLvl
+ .curLvl = curLvl,
};
{
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index b03d009c3cd..2019554996c 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -3128,7 +3128,7 @@ bool BKE_animsys_nla_remap_keyframe_value(struct NlaKeyframingContext *context,
}
/* Find the evaluation channel for the NLA stack below current strip. */
- NlaEvalChannelKey key = { .ptr = *prop_ptr, .prop = prop };
+ NlaEvalChannelKey key = { .ptr = *prop_ptr, .prop = prop, };
NlaEvalData *nlaeval = &context->nla_channels;
NlaEvalChannel *nec = nlaevalchan_verify_key(nlaeval, NULL, &key);
int real_index = nlaevalchan_validate_index(nec, index);
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 6dc49a1cebb..a1b44265356 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -2641,7 +2641,7 @@ void BKE_armature_cached_bbone_deformation_update(Object *object)
ArmatureBBoneDefmatsData data = {
.pdef_info_array = pdef_info_array,
.dualquats = dualquats,
- .use_quaternion = use_quaternion
+ .use_quaternion = use_quaternion,
};
BLI_task_parallel_listbase(&pose->chanbase,
&data,
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index d868a06d134..53278d76399 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -1064,13 +1064,15 @@ static bool cloth_bvh_objcollisions_nearcheck(ClothModifierData * clmd, Collisio
{
*collisions = (CollPair *)MEM_mallocN(sizeof(CollPair) * numresult, "collision array");
- ColDetectData data = {.clmd = clmd,
- .collmd = collmd,
- .overlap = overlap,
- .collisions = *collisions,
- .culling = culling,
- .use_normal = use_normal,
- .collided = false};
+ ColDetectData data = {
+ .clmd = clmd,
+ .collmd = collmd,
+ .overlap = overlap,
+ .collisions = *collisions,
+ .culling = culling,
+ .use_normal = use_normal,
+ .collided = false,
+ };
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
@@ -1083,10 +1085,12 @@ static bool cloth_bvh_objcollisions_nearcheck(ClothModifierData * clmd, Collisio
static bool cloth_bvh_selfcollisions_nearcheck(ClothModifierData * clmd, CollPair *collisions,
int numresult, BVHTreeOverlap *overlap)
{
- SelfColDetectData data = {.clmd = clmd,
- .overlap = overlap,
- .collisions = collisions,
- .collided = false};
+ SelfColDetectData data = {
+ .clmd = clmd,
+ .overlap = overlap,
+ .collisions = collisions,
+ .collided = false,
+ };
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 590fe559ff0..094f13d066c 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1580,7 +1580,7 @@ static void dynamicPaint_setInitialColor(const Scene *scene, DynamicPaintSurface
DynamicPaintSetInitColorData data = {
.surface = surface,
.mloop = mloop, .mlooptri = mlooptri, .mloopuv = mloopuv, .pool = pool,
- .scene_color_manage = scene_color_manage
+ .scene_color_manage = scene_color_manage,
};
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
@@ -1595,7 +1595,7 @@ static void dynamicPaint_setInitialColor(const Scene *scene, DynamicPaintSurface
DynamicPaintSetInitColorData data = {
.surface = surface,
.mlooptri = mlooptri, .mloopuv = mloopuv,
- .scene_color_manage = scene_color_manage
+ .scene_color_manage = scene_color_manage,
};
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
@@ -1756,7 +1756,7 @@ static void dynamicPaint_applySurfaceDisplace(DynamicPaintSurface *surface, Mesh
if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE) {
MVert *mvert = result->mvert;
- DynamicPaintModifierApplyData data = {.surface = surface, .mvert = mvert};
+ DynamicPaintModifierApplyData data = { .surface = surface, .mvert = mvert, };
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
settings.use_threading = (sData->total_points > 10000);
@@ -1903,7 +1903,7 @@ static Mesh *dynamicPaint_Modifier_apply(
/* paint is stored on dry and wet layers, so mix final color first */
float (*fcolor)[4] = MEM_callocN(sizeof(*fcolor) * sData->total_points, "Temp paint color");
- DynamicPaintModifierApplyData data = {.surface = surface, .fcolor = fcolor};
+ DynamicPaintModifierApplyData data = { .surface = surface, .fcolor = fcolor, };
{
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
@@ -2007,7 +2007,7 @@ static Mesh *dynamicPaint_Modifier_apply(
else if (surface->type == MOD_DPAINT_SURFACE_T_WAVE) {
MVert *mvert = result->mvert;
- DynamicPaintModifierApplyData data = {.surface = surface, .mvert = mvert};
+ DynamicPaintModifierApplyData data = { .surface = surface, .mvert = mvert, };
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
settings.use_threading = (sData->total_points > 1000);
@@ -2481,7 +2481,7 @@ static int dynamic_paint_find_neighbour_pixel(
DynamicPaintFindIslandBorderData bdata = {
.vert_to_looptri_map = vert_to_looptri_map,
.w = w, .h = h, .px = px, .py = py,
- .best_index = NOT_FOUND, .best_weight = 1.0f
+ .best_index = NOT_FOUND, .best_weight = 1.0f,
};
float pixel[2];
@@ -3236,7 +3236,7 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, char *filenam
return;
}
- DynamicPaintOutputSurfaceImageData data = {.surface = surface, .ibuf = ibuf};
+ DynamicPaintOutputSurfaceImageData data = { .surface = surface, .ibuf = ibuf, };
switch (surface->type) {
case MOD_DPAINT_SURFACE_T_PAINT:
switch (output_layer) {
@@ -4191,7 +4191,7 @@ static int dynamicPaint_paintMesh(Depsgraph *depsgraph, DynamicPaintSurface *sur
.scene = scene, .timescale = timescale, .c_index = c_index,
.mesh = mesh, .mvert = mvert, .mloop = mloop, .mlooptri = mlooptri,
.brush_radius = brush_radius, .avg_brushNor = avg_brushNor, .brushVelocity = brushVelocity,
- .treeData = &treeData
+ .treeData = &treeData,
};
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
@@ -5351,7 +5351,7 @@ static void dynamicPaint_doBorderStep(DynamicPaintSurface *surface)
/* Don't use prevPoint, relying on the condition that neighbors are never border pixels. */
DynamicPaintEffectData data = {
- .surface = surface
+ .surface = surface,
};
ParallelRangeSettings settings;
@@ -5907,7 +5907,7 @@ static int dynamicPaint_doStep(
return 0;
if (dynamic_paint_surface_needs_dry_dissolve(surface)) {
- DynamicPaintDissolveDryData data = {.surface = surface, .timescale = timescale};
+ DynamicPaintDissolveDryData data = { .surface = surface, .timescale = timescale, };
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
settings.use_threading = (sData->total_points > 1000);
diff --git a/source/blender/blenkernel/intern/keyconfig.c b/source/blender/blenkernel/intern/keyconfig.c
index f2db375f3ec..0feca3a5e06 100644
--- a/source/blender/blenkernel/intern/keyconfig.c
+++ b/source/blender/blenkernel/intern/keyconfig.c
@@ -126,7 +126,7 @@ void BKE_keyconfig_pref_set_select_mouse(UserDef *userdef, int value, bool overr
wmKeyConfigPref *kpt = BKE_keyconfig_pref_ensure(userdef, WM_KEYCONFIG_STR_DEFAULT);
IDProperty *idprop = IDP_GetPropertyFromGroup(kpt->prop, "select_mouse");
if (!idprop) {
- IDPropertyTemplate tmp = { .i = value };
+ IDPropertyTemplate tmp = { .i = value, };
IDP_AddToGroup(kpt->prop, IDP_New(IDP_INT, &tmp, "select_mouse"));
}
else if (override) {
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 5c867c075ac..7634f1e0434 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -696,7 +696,7 @@ bool BKE_id_copy_ex(Main *bmain, const ID *id, ID **r_newid, const int flag, con
}
/* Update ID refcount, remap pointers to self in new ID. */
- struct IDCopyLibManagementData data = {.id_src = id,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list