diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-06 16:06:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-06 16:34:48 +0300 |
commit | e305560f13c3c67b048dc3889c7797eae2e345c4 (patch) | |
tree | b3593db52da67e738fbfe592507a517b9ec35f53 /source/blender/modifiers | |
parent | f10a88ae8d22cbf570956fd18ff60ef8e84fdd85 (diff) |
Cleanup: add trailing commas to structs
Needed for clang formatting to workaround bug/limit, see: T53211
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_surfacedeform.c | 28 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_uvwarp.c | 8 |
2 files changed, 20 insertions, 16 deletions
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index d4781e419cf..dd9e11f86c5 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -269,7 +269,7 @@ BLI_INLINE void sortPolyVertsTri(unsigned int *indices, const MLoop * const mloo BLI_INLINE unsigned int nearestVert(SDefBindCalcData * const data, const float point_co[3]) { - BVHTreeNearest nearest = {.dist_sq = FLT_MAX, .index = -1}; + BVHTreeNearest nearest = { .dist_sq = FLT_MAX, .index = -1, }; const MPoly *poly; const MEdge *edge; const MLoop *loop; @@ -976,18 +976,20 @@ static bool surfacedeformBind( smd->numverts = numverts; smd->numpoly = tnumpoly; - SDefBindCalcData data = {.treeData = &treeData, - .vert_edges = vert_edges, - .edge_polys = edge_polys, - .mpoly = mpoly, - .medge = medge, - .mloop = mloop, - .looptri = BKE_mesh_runtime_looptri_ensure(target), - .targetCos = MEM_malloc_arrayN(tnumverts, sizeof(float[3]), "SDefTargetBindVertArray"), - .bind_verts = smd->verts, - .vertexCos = vertexCos, - .falloff = smd->falloff, - .success = MOD_SDEF_BIND_RESULT_SUCCESS}; + SDefBindCalcData data = { + .treeData = &treeData, + .vert_edges = vert_edges, + .edge_polys = edge_polys, + .mpoly = mpoly, + .medge = medge, + .mloop = mloop, + .looptri = BKE_mesh_runtime_looptri_ensure(target), + .targetCos = MEM_malloc_arrayN(tnumverts, sizeof(float[3]), "SDefTargetBindVertArray"), + .bind_verts = smd->verts, + .vertexCos = vertexCos, + .falloff = smd->falloff, + .success = MOD_SDEF_BIND_RESULT_SUCCESS, + }; if (data.targetCos == NULL) { modifier_setError((ModifierData *)smd, "Out of memory"); diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c index c051f51facc..5ba92326797 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.c +++ b/source/blender/modifiers/intern/MOD_uvwarp.c @@ -202,9 +202,11 @@ static Mesh *applyModifier( mloopuv = CustomData_duplicate_referenced_layer_named(&mesh->ldata, CD_MLOOPUV, uvname, numLoops); MOD_get_vgroup(ctx->object, mesh, umd->vgroup_name, &dvert, &defgrp_index); - UVWarpData data = {.mpoly = mpoly, .mloop = mloop, .mloopuv = mloopuv, - .dvert = dvert, .defgrp_index = defgrp_index, - .warp_mat = warp_mat, .axis_u = axis_u, .axis_v = axis_v}; + UVWarpData data = { + .mpoly = mpoly, .mloop = mloop, .mloopuv = mloopuv, + .dvert = dvert, .defgrp_index = defgrp_index, + .warp_mat = warp_mat, .axis_u = axis_u, .axis_v = axis_v, + }; ParallelRangeSettings settings; BLI_parallel_range_settings_defaults(&settings); settings.use_threading = (numPolys > 1000); |