Cleanup: style, use braces for bmesh

1 files changed, 91 insertions, 31 deletions

diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c
index 4dc6cc8b965..66cd3a0b30c 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c
@@ -318,10 +318,14 @@ void BM_mesh_bm_from_me(
 		/* Copy Custom Data */
 		CustomData_to_bmesh_block(&me->vdata, &bm->vdata, i, &v->head.data, true);
 
-		if (cd_vert_bweight_offset != -1) BM_ELEM_CD_SET_FLOAT(v, cd_vert_bweight_offset, (float)mvert->bweight / 255.0f);
+		if (cd_vert_bweight_offset != -1) {
+			BM_ELEM_CD_SET_FLOAT(v, cd_vert_bweight_offset, (float)mvert->bweight / 255.0f);
+		}
 
 		/* set shape key original index */
-		if (cd_shape_keyindex_offset != -1) BM_ELEM_CD_SET_INT(v, cd_shape_keyindex_offset, i);
+		if (cd_shape_keyindex_offset != -1) {
+			BM_ELEM_CD_SET_INT(v, cd_shape_keyindex_offset, i);
+		}
 
 		/* set shapekey data */
 		if (tot_shape_keys) {
@@ -353,8 +357,12 @@ void BM_mesh_bm_from_me(
 		/* Copy Custom Data */
 		CustomData_to_bmesh_block(&me->edata, &bm->edata, i, &e->head.data, true);
 
-		if (cd_edge_bweight_offset != -1) BM_ELEM_CD_SET_FLOAT(e, cd_edge_bweight_offset, (float)medge->bweight / 255.0f);
-		if (cd_edge_crease_offset  != -1) BM_ELEM_CD_SET_FLOAT(e, cd_edge_crease_offset,  (float)medge->crease  / 255.0f);
+		if (cd_edge_bweight_offset != -1) {
+			BM_ELEM_CD_SET_FLOAT(e, cd_edge_bweight_offset, (float)medge->bweight / 255.0f);
+		}
+		if (cd_edge_crease_offset  != -1) {
+			BM_ELEM_CD_SET_FLOAT(e, cd_edge_crease_offset,  (float)medge->crease  / 255.0f);
+		}
 
 	}
 	if (is_new) {
@@ -397,7 +405,9 @@ void BM_mesh_bm_from_me(
 		}
 
 		f->mat_nr = mp->mat_nr;
-		if (i == me->act_face) bm->act_face = f;
+		if (i == me->act_face) {
+			bm->act_face = f;
+		}
 
 		int j = mp->loopstart;
 		l_iter = l_first = BM_FACE_FIRST_LOOP(f);
@@ -567,20 +577,36 @@ void BM_mesh_bm_to_me(
 	ototvert = me->totvert;
 
 	/* new vertex block */
-	if (bm->totvert == 0) mvert = NULL;
-	else mvert = MEM_callocN(bm->totvert * sizeof(MVert), "loadeditbMesh vert");
+	if (bm->totvert == 0) {
+		mvert = NULL;
+	}
+	else {
+		mvert = MEM_callocN(bm->totvert * sizeof(MVert), "loadeditbMesh vert");
+	}
 
 	/* new edge block */
-	if (bm->totedge == 0) medge = NULL;
-	else medge = MEM_callocN(bm->totedge * sizeof(MEdge), "loadeditbMesh edge");
+	if (bm->totedge == 0) {
+		medge = NULL;
+	}
+	else {
+		medge = MEM_callocN(bm->totedge * sizeof(MEdge), "loadeditbMesh edge");
+	}
 
 	/* new ngon face block */
-	if (bm->totface == 0) mpoly = NULL;
-	else mpoly = MEM_callocN(bm->totface * sizeof(MPoly), "loadeditbMesh poly");
+	if (bm->totface == 0) {
+		mpoly = NULL;
+	}
+	else {
+		mpoly = MEM_callocN(bm->totface * sizeof(MPoly), "loadeditbMesh poly");
+	}
 
 	/* new loop block */
-	if (bm->totloop == 0) mloop = NULL;
-	else mloop = MEM_callocN(bm->totloop * sizeof(MLoop), "loadeditbMesh loop");
+	if (bm->totloop == 0) {
+		mloop = NULL;
+	}
+	else {
+		mloop = MEM_callocN(bm->totloop * sizeof(MLoop), "loadeditbMesh loop");
+	}
 
 	/* lets save the old verts just in case we are actually working on
 	 * a key ... we now do processing of the keys at the end */
@@ -640,7 +666,9 @@ void BM_mesh_bm_to_me(
 		/* copy over customdat */
 		CustomData_from_bmesh_block(&bm->vdata, &me->vdata, v->head.data, i);
 
-		if (cd_vert_bweight_offset != -1) mvert->bweight = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(v, cd_vert_bweight_offset);
+		if (cd_vert_bweight_offset != -1) {
+			mvert->bweight = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(v, cd_vert_bweight_offset);
+		}
 
 		i++;
 		mvert++;
@@ -664,8 +692,12 @@ void BM_mesh_bm_to_me(
 
 		bmesh_quick_edgedraw_flag(med, e);
 
-		if (cd_edge_crease_offset  != -1) med->crease  = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(e, cd_edge_crease_offset);
-		if (cd_edge_bweight_offset != -1) med->bweight = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(e, cd_edge_bweight_offset);
+		if (cd_edge_crease_offset  != -1) {
+			med->crease  = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(e, cd_edge_crease_offset);
+		}
+		if (cd_edge_bweight_offset != -1) {
+			med->bweight = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(e, cd_edge_bweight_offset);
+		}
 
 		i++;
 		med++;
@@ -697,7 +729,9 @@ void BM_mesh_bm_to_me(
 			BM_CHECK_ELEMENT(l_iter->v);
 		} while ((l_iter = l_iter->next) != l_first);
 
-		if (f == bm->act_face) me->act_face = i;
+		if (f == bm->act_face) {
+			me->act_face = i;
+		}
 
 		/* copy over customdata */
 		CustomData_from_bmesh_block(&bm->pdata, &me->pdata, f->head.data, i);
@@ -723,15 +757,21 @@ void BM_mesh_bm_to_me(
 
 				if (ob->par1 < ototvert) {
 					eve = vertMap[ob->par1];
-					if (eve) ob->par1 = BM_elem_index_get(eve);
+					if (eve) {
+						ob->par1 = BM_elem_index_get(eve);
+					}
 				}
 				if (ob->par2 < ototvert) {
 					eve = vertMap[ob->par2];
-					if (eve) ob->par2 = BM_elem_index_get(eve);
+					if (eve) {
+						ob->par2 = BM_elem_index_get(eve);
+					}
 				}
 				if (ob->par3 < ototvert) {
 					eve = vertMap[ob->par3];
-					if (eve) ob->par3 = BM_elem_index_get(eve);
+					if (eve) {
+						ob->par3 = BM_elem_index_get(eve);
+					}
 				}
 
 			}
@@ -763,7 +803,9 @@ void BM_mesh_bm_to_me(
 			}
 		}
 
-		if (vertMap) MEM_freeN(vertMap);
+		if (vertMap) {
+			MEM_freeN(vertMap);
+		}
 	}
 
 	BKE_mesh_update_customdata_pointers(me, false);
@@ -809,12 +851,14 @@ void BM_mesh_bm_to_me(
 		 * necessary */
 		j = 0;
 		for (i = 0; i < bm->vdata.totlayer; i++) {
-			if (bm->vdata.layers[i].type != CD_SHAPEKEY)
+			if (bm->vdata.layers[i].type != CD_SHAPEKEY) {
 				continue;
+			}
 
 			for (currkey = me->key->block.first; currkey; currkey = currkey->next) {
-				if (currkey->uid == bm->vdata.layers[i].uid)
+				if (currkey->uid == bm->vdata.layers[i].uid) {
 					break;
+				}
 			}
 
 			if (!currkey) {
@@ -930,10 +974,14 @@ void BM_mesh_bm_to_me(
 			currkey->data = newkey;
 		}
 
-		if (ofs) MEM_freeN(ofs);
+		if (ofs) {
+			MEM_freeN(ofs);
+		}
 	}
 
-	if (oldverts) MEM_freeN(oldverts);
+	if (oldverts) {
+		MEM_freeN(oldverts);
+	}
 
 	/* topology could be changed, ensure mdisps are ok */
 	multires_topology_changed(me);
@@ -1025,9 +1073,13 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *me, const CustomData_MeshMasks *
 
 		mv->flag = BM_vert_flag_to_mflag(eve);
 
-		if (cd_vert_bweight_offset != -1) mv->bweight = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(eve, cd_vert_bweight_offset);
+		if (cd_vert_bweight_offset != -1) {
+			mv->bweight = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(eve, cd_vert_bweight_offset);
+		}
 
-		if (add_orig) *index++ = i;
+		if (add_orig) {
+			*index++ = i;
+		}
 
 		CustomData_from_bmesh_block(&bm->vdata, &me->vdata, eve->head.data, i);
 	}
@@ -1052,11 +1104,17 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *me, const CustomData_MeshMasks *
 			}
 		}
 
-		if (cd_edge_crease_offset  != -1) med->crease  = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(eed, cd_edge_crease_offset);
-		if (cd_edge_bweight_offset != -1) med->bweight = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(eed, cd_edge_bweight_offset);
+		if (cd_edge_crease_offset  != -1) {
+			med->crease  = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(eed, cd_edge_crease_offset);
+		}
+		if (cd_edge_bweight_offset != -1) {
+			med->bweight = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(eed, cd_edge_bweight_offset);
+		}
 
 		CustomData_from_bmesh_block(&bm->edata, &me->edata, eed->head.data, i);
-		if (add_orig) *index++ = i;
+		if (add_orig) {
+			*index++ = i;
+		}
 	}
 	bm->elem_index_dirty &= ~BM_EDGE;
 
@@ -1088,7 +1146,9 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *me, const CustomData_MeshMasks *
 
 		CustomData_from_bmesh_block(&bm->pdata, &me->pdata, efa->head.data, i);
 
-		if (add_orig) *index++ = i;
+		if (add_orig) {
+			*index++ = i;
+		}
 	}
 	bm->elem_index_dirty &= ~(BM_FACE | BM_LOOP);