Commit: 4185b3e36d16dff92ed3e3c0b25033acea5a0793
Author: Campbell Barton
Date: Fri Mar 8 17:16:30 2019 +1100
Branches: master
https://developer.blender.org/rB4185b3e36d16dff92ed3e3c0b25033acea5a0793
Cleanup: style
===================================================================
M source/blender/modifiers/intern/MOD_bevel.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/modifiers/intern/MOD_edgesplit.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_triangulate.c
M source/blender/modifiers/intern/MOD_wireframe.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_bevel.c
b/source/blender/modifiers/intern/MOD_bevel.c
index 3450e745341..6e1dd9ed45d 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -117,7 +117,7 @@ static Mesh *applyModifier(ModifierData *md, const
ModifierEvalContext *ctx, Mes
.use_shapekey = false,
.active_shapekey = 0,
/* XXX We probably can use CD_MASK_BAREMESH_ORIGDINDEX
here instead (also for other modifiers cases)? */
- .cd_mask_extra = {.vmask=CD_MASK_ORIGINDEX,
.emask=CD_MASK_ORIGINDEX, .pmask=CD_MASK_ORIGINDEX},
+ .cd_mask_extra = {.vmask = CD_MASK_ORIGINDEX, .emask =
CD_MASK_ORIGINDEX, .pmask = CD_MASK_ORIGINDEX},
});
if ((bmd->lim_flags & MOD_BEVEL_VGROUP) && bmd->defgrp_name[0])
diff --git a/source/blender/modifiers/intern/MOD_decimate.c
b/source/blender/modifiers/intern/MOD_decimate.c
index 52289ef107e..0ca6111c41a 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -163,7 +163,7 @@ static Mesh *applyModifier(
&(struct BMeshCreateParams){0},
&(struct BMeshFromMeshParams){
.calc_face_normal = calc_face_normal,
- .cd_mask_extra = {.vmask=CD_MASK_ORIGINDEX,
.emask=CD_MASK_ORIGINDEX, .pmask=CD_MASK_ORIGINDEX},
+ .cd_mask_extra = {.vmask = CD_MASK_ORIGINDEX, .emask =
CD_MASK_ORIGINDEX, .pmask = CD_MASK_ORIGINDEX},
});
switch (dmd->mode) {
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c
b/source/blender/modifiers/intern/MOD_edgesplit.c
index 70c1ec5a59b..a7b980494b3 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -60,7 +60,7 @@ static Mesh *doEdgeSplit(Mesh *mesh, EdgeSplitModifierData
*emd)
.add_key_index = false,
.use_shapekey = false,
.active_shapekey = 0,
- .cd_mask_extra = {.vmask=CD_MASK_ORIGINDEX,
.emask=CD_MASK_ORIGINDEX, .pmask=CD_MASK_ORIGINDEX},
+ .cd_mask_extra = {.vmask = CD_MASK_ORIGINDEX, .emask =
CD_MASK_ORIGINDEX, .pmask = CD_MASK_ORIGINDEX},
});
if (do_split_angle) {
diff --git a/source/blender/modifiers/intern/MOD_mirror.c
b/source/blender/modifiers/intern/MOD_mirror.c
index cb4243a6150..c46445471df 100644
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -91,12 +91,12 @@ static Mesh *doBiscetOnMirrorPlane(
BMVert *v, *v_next;
bm = BKE_mesh_to_bmesh_ex(
- mesh,
- &(struct BMeshCreateParams){0},
- &(struct BMeshFromMeshParams){
- .calc_face_normal = true,
- .cd_mask_extra = {.vmask=CD_MASK_ORIGINDEX,
.emask=CD_MASK_ORIGINDEX, .pmask=CD_MASK_ORIGINDEX},
- });
+ mesh,
+ &(struct BMeshCreateParams){0},
+ &(struct BMeshFromMeshParams){
+ .calc_face_normal = true,
+ .cd_mask_extra = {.vmask = CD_MASK_ORIGINDEX, .emask =
CD_MASK_ORIGINDEX, .pmask = CD_MASK_ORIGINDEX},
+ });
/* Define bisecting plane (aka mirror plane). */
float plane[4];
diff --git a/source/blender/modifiers/intern/MOD_triangulate.c
b/source/blender/modifiers/intern/MOD_triangulate.c
index 1d28d28286b..802bde21b5c 100644
--- a/source/blender/modifiers/intern/MOD_triangulate.c
+++ b/source/blender/modifiers/intern/MOD_triangulate.c
@@ -40,7 +40,7 @@ static Mesh *triangulate_mesh(Mesh *mesh, const int
quad_method, const int ngon_
BMesh *bm;
int total_edges, i;
MEdge *me;
- CustomData_MeshMasks cddata_masks = {.vmask=CD_MASK_ORIGINDEX,
.emask=CD_MASK_ORIGINDEX, .pmask=CD_MASK_ORIGINDEX};
+ CustomData_MeshMasks cddata_masks = {.vmask = CD_MASK_ORIGINDEX, .emask
= CD_MASK_ORIGINDEX, .pmask = CD_MASK_ORIGINDEX};
bool keep_clnors = (flag & MOD_TRIANGULATE_KEEP_CUSTOMLOOP_NORMALS) !=
0;
diff --git a/source/blender/modifiers/intern/MOD_wireframe.c
b/source/blender/modifiers/intern/MOD_wireframe.c
index b9136233456..2f70ab16cf8 100644
--- a/source/blender/modifiers/intern/MOD_wireframe.c
+++ b/source/blender/modifiers/intern/MOD_wireframe.c
@@ -69,7 +69,7 @@ static Mesh *WireframeModifier_do(WireframeModifierData *wmd,
Object *ob, Mesh *
.add_key_index = false,
.use_shapekey = false,
.active_shapekey = 0,
- .cd_mask_extra = {.vmask=CD_MASK_ORIGINDEX,
.emask=CD_MASK_ORIGINDEX, .pmask=CD_MASK_ORIGINDEX},
+ .cd_mask_extra = {.vmask = CD_MASK_ORIGINDEX, .emask =
CD_MASK_ORIGINDEX, .pmask = CD_MASK_ORIGINDEX},
});
BM_mesh_wireframe(
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
