[Bf-blender-cvs] [854db8951bc] master: Cleanup: strip trailing space in bmesh module

Campbell Barton noreply at git.blender.org
Mon Jun 4 08:56:33 CEST 2018


Commit: 854db8951bc15a7545eea3ff2219a28897698ead
Author: Campbell Barton
Date:   Mon Jun 4 08:48:38 2018 +0200
Branches: master
https://developer.blender.org/rB854db8951bc15a7545eea3ff2219a28897698ead

Cleanup: strip trailing space in bmesh module

===================================================================

M	source/blender/bmesh/bmesh_class.h
M	source/blender/bmesh/intern/bmesh_construct.c
M	source/blender/bmesh/intern/bmesh_core.c
M	source/blender/bmesh/intern/bmesh_delete.c
M	source/blender/bmesh/intern/bmesh_edgeloop.c
M	source/blender/bmesh/intern/bmesh_interp.c
M	source/blender/bmesh/intern/bmesh_iterators.c
M	source/blender/bmesh/intern/bmesh_iterators_inline.h
M	source/blender/bmesh/intern/bmesh_log.c
M	source/blender/bmesh/intern/bmesh_marking.c
M	source/blender/bmesh/intern/bmesh_mesh.c
M	source/blender/bmesh/intern/bmesh_mods.c
M	source/blender/bmesh/intern/bmesh_operators.c
M	source/blender/bmesh/intern/bmesh_polygon.c
M	source/blender/bmesh/intern/bmesh_queries.c
M	source/blender/bmesh/intern/bmesh_structure.c
M	source/blender/bmesh/intern/bmesh_walkers.c
M	source/blender/bmesh/intern/bmesh_walkers_impl.c
M	source/blender/bmesh/operators/bmo_create.c
M	source/blender/bmesh/operators/bmo_dissolve.c
M	source/blender/bmesh/operators/bmo_dupe.c
M	source/blender/bmesh/operators/bmo_extrude.c
M	source/blender/bmesh/operators/bmo_hull.c
M	source/blender/bmesh/operators/bmo_mirror.c
M	source/blender/bmesh/operators/bmo_primitive.c
M	source/blender/bmesh/operators/bmo_removedoubles.c
M	source/blender/bmesh/operators/bmo_subdivide.c
M	source/blender/bmesh/operators/bmo_triangulate.c
M	source/blender/bmesh/tools/bmesh_bevel.c

===================================================================

diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h
index bec2c7a1f45..10e2892c5a5 100644
--- a/source/blender/bmesh/bmesh_class.h
+++ b/source/blender/bmesh/bmesh_class.h
@@ -119,7 +119,7 @@ typedef struct BMEdge {
 	/* the list of loops around the edge (use l->radial_prev/next)
 	 * to access the other loops using the edge */
 	struct BMLoop *l;
-	
+
 	/* disk cycle pointers
 	 * relative data: d1 indicates indicates the next/prev edge around vertex v1 and d2 does the same for v2 */
 	BMDiskLink v1_disk_link, v2_disk_link;
@@ -229,7 +229,7 @@ typedef struct BMesh {
 
 	int toolflag_index;
 	struct BMOperator *currentop;
-	
+
 	CustomData vdata, edata, ldata, pdata;
 
 #ifdef USE_BMESH_HOLES
@@ -241,10 +241,10 @@ typedef struct BMesh {
 	 * make sure they're in sync!
 	 * Only use when the edit mesh cant be accessed - campbell */
 	short selectmode;
-	
+
 	/* ID of the shape key this bmesh came from */
 	int shapenr;
-	
+
 	int totflags;
 	ListBase selected;
 
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index f8ecbe1756b..1b300b24808 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -712,7 +712,7 @@ BMesh *BM_mesh_copy(BMesh *bm_old)
 
 	/* safety check */
 	BLI_assert(i == bm_old->totvert);
-	
+
 	BM_ITER_MESH_INDEX (e, &iter, bm_old, BM_EDGES_OF_MESH, i) {
 		e_new = BM_edge_create(bm_new,
 		                       vtable[BM_elem_index_get(e->v1)],
@@ -730,7 +730,7 @@ BMesh *BM_mesh_copy(BMesh *bm_old)
 
 	/* safety check */
 	BLI_assert(i == bm_old->totedge);
-	
+
 	BM_ITER_MESH_INDEX (f, &iter, bm_old, BM_FACES_OF_MESH, i) {
 		BM_elem_index_set(f, i); /* set_inline */
 
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index 7e35866887d..c6836187eee 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -158,7 +158,7 @@ BMEdge *BM_edge_create(
 
 	if ((create_flag & BM_CREATE_NO_DOUBLE) && (e = BM_edge_exists(v1, v2)))
 		return e;
-	
+
 	e = BLI_mempool_alloc(bm->epool);
 
 
@@ -286,7 +286,7 @@ static BMLoop *bm_face_boundary_add(
 	BMLoopList *lst = BLI_mempool_calloc(bm->looplistpool);
 #endif
 	BMLoop *l = bm_loop_create(bm, startv, starte, f, NULL /* starte->l */, create_flag);
-	
+
 	bmesh_radial_loop_append(starte, l);
 
 #ifdef USE_BMESH_HOLES
@@ -295,7 +295,7 @@ static BMLoop *bm_face_boundary_add(
 #else
 	f->l_first = l;
 #endif
-	
+
 	return l;
 }
 
@@ -330,7 +330,7 @@ BMFace *BM_face_copy(
 	do {
 		if (copy_edges) {
 			BMVert *v1, *v2;
-			
+
 			if (l_iter->e->v1 == verts[i]) {
 				v1 = verts[i];
 				v2 = verts[(i + 1) % f->len];
@@ -339,7 +339,7 @@ BMFace *BM_face_copy(
 				v2 = verts[i];
 				v1 = verts[(i + 1) % f->len];
 			}
-			
+
 			edges[i] = BM_edge_create(bm_dst, v1, v2, l_iter->e, BM_CREATE_NOP);
 		}
 		else {
@@ -347,11 +347,11 @@ BMFace *BM_face_copy(
 		}
 		i++;
 	} while ((l_iter = l_iter->next) != l_first);
-	
+
 	f_copy = BM_face_create(bm_dst, verts, edges, f->len, NULL, BM_CREATE_SKIP_CD);
-	
+
 	BM_elem_attrs_copy(bm_src, bm_dst, f, f_copy);
-	
+
 	l_iter = l_first = BM_FACE_FIRST_LOOP(f);
 	l_copy = BM_FACE_FIRST_LOOP(f_copy);
 	do {
@@ -463,12 +463,12 @@ BMFace *BM_face_create(
 		lastl->next = l;
 		lastl = l;
 	}
-	
+
 	startl->prev = lastl;
 	lastl->next = startl;
-	
+
 	f->len = len;
-	
+
 	if (!(create_flag & BM_CREATE_SKIP_CD)) {
 		if (f_example) {
 			BM_elem_attrs_copy(bm, bm, f_example, f);
@@ -563,7 +563,7 @@ int bmesh_elem_check(void *element, const char htype)
 
 	if (head->htype != htype)
 		return IS_WRONG_TYPE;
-	
+
 	switch (htype) {
 		case BM_VERT:
 		{
@@ -830,12 +830,12 @@ void BM_face_edges_kill(BMesh *bm, BMFace *f)
 	BMLoop *l_iter;
 	BMLoop *l_first;
 	int i = 0;
-	
+
 	l_iter = l_first = BM_FACE_FIRST_LOOP(f);
 	do {
 		edges[i++] = l_iter->e;
 	} while ((l_iter = l_iter->next) != l_first);
-	
+
 	for (i = 0; i < f->len; i++) {
 		BM_edge_kill(bm, edges[i]);
 	}
@@ -851,12 +851,12 @@ void BM_face_verts_kill(BMesh *bm, BMFace *f)
 	BMLoop *l_iter;
 	BMLoop *l_first;
 	int i = 0;
-	
+
 	l_iter = l_first = BM_FACE_FIRST_LOOP(f);
 	do {
 		verts[i++] = l_iter->v;
 	} while ((l_iter = l_iter->next) != l_first);
-	
+
 	for (i = 0; i < f->len; i++) {
 		BM_vert_kill(bm, verts[i]);
 	}
@@ -979,7 +979,7 @@ void BM_edge_kill(BMesh *bm, BMEdge *e)
 
 	bmesh_disk_edge_remove(e, e->v1);
 	bmesh_disk_edge_remove(e, e->v2);
-	
+
 	bm_kill_only_edge(bm, e);
 }
 
@@ -1159,11 +1159,11 @@ static bool bm_vert_is_manifold_flagged(BMVert *v, const char api_flag)
 		if (!l) {
 			return false;
 		}
-		
+
 		if (BM_edge_is_boundary(l->e)) {
 			return false;
 		}
-		
+
 		do {
 			if (!BM_ELEM_API_FLAG_TEST(l->f, api_flag))
 				return false;
@@ -1361,7 +1361,7 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const bool do_del)
 			BM_face_kill(bm, faces[i]);
 		}
 	}
-	
+
 	BLI_array_free(edges);
 	BLI_array_free(deledges);
 	BLI_array_free(delverts);
@@ -1562,7 +1562,7 @@ BMFace *bmesh_kernel_split_face_make_edge(
 	BM_CHECK_ELEMENT(e);
 	BM_CHECK_ELEMENT(f);
 	BM_CHECK_ELEMENT(f2);
-	
+
 	return f2;
 }
 
@@ -1664,7 +1664,7 @@ BMVert *bmesh_kernel_split_edge_make_vert(BMesh *bm, BMVert *tv, BMEdge *e, BMEd
 					is_first = false;
 					l->radial_next = l->radial_prev = NULL;
 				}
-				
+
 				bmesh_radial_loop_append(l_new->e, l_new);
 				bmesh_radial_loop_append(l->e, l);
 			}
@@ -1784,7 +1784,7 @@ BMEdge *bmesh_kernel_join_edge_kill_vert(
 	if (BM_vert_in_edge(e_kill, v_kill) == 0) {
 		return NULL;
 	}
-	
+
 	if (bmesh_disk_count_at_most(v_kill, 3) == 2) {
 #ifndef NDEBUG
 		int valence1, valence2;
@@ -2122,10 +2122,10 @@ BMFace *bmesh_kernel_join_face_kill_edge(BMesh *bm, BMFace *f1, BMFace *f2, BMEd
 	/* join the two loop */
 	l_f1->prev->next = l_f2->next;
 	l_f2->next->prev = l_f1->prev;
-	
+
 	l_f1->next->prev = l_f2->prev;
 	l_f2->prev->next = l_f1->next;
-	
+
 	/* if l_f1 was baseloop, make l_f1->next the base. */
 	if (BM_FACE_FIRST_LOOP(f1) == l_f1)
 		BM_FACE_FIRST_LOOP(f1) = l_f1->next;
@@ -2137,11 +2137,11 @@ BMFace *bmesh_kernel_join_face_kill_edge(BMesh *bm, BMFace *f1, BMFace *f2, BMEd
 	newlen = f1->len;
 	for (i = 0, l_iter = BM_FACE_FIRST_LOOP(f1); i < newlen; i++, l_iter = l_iter->next)
 		l_iter->f = f1;
-	
+
 	/* remove edge from the disk cycle of its two vertices */
 	bmesh_disk_edge_remove(l_f1->e, l_f1->e->v1);
 	bmesh_disk_edge_remove(l_f1->e, l_f1->e->v2);
-	
+
 	/* deallocate edge and its two loops as well as f2 */
 	if (bm->etoolflagpool) {
 		BLI_mempool_free(bm->etoolflagpool, ((BMEdge_OFlag *)l_f1->e)->oflags);
@@ -2165,7 +2165,7 @@ BMFace *bmesh_kernel_join_face_kill_edge(BMesh *bm, BMFace *f1, BMFace *f2, BMEd
 	/* validate the new loop cycle */
 	edok = bmesh_loop_validate(f1);
 	BMESH_ASSERT(edok != false);
-	
+
 	return f1;
 }
 
@@ -2600,7 +2600,7 @@ void bmesh_kernel_edge_separate(
 
 	BLI_assert(l_sep->e == e);
 	BLI_assert(e->l);
-	
+
 	if (BM_edge_is_boundary(e)) {
 		BLI_assert(0); /* no cut required */
 		return;
diff --git a/source/blender/bmesh/intern/bmesh_delete.c b/source/blender/bmesh/intern/bmesh_delete.c
index 1449a6ef9d7..1869bc49da0 100644
--- a/source/blender/bmesh/intern/bmesh_delete.c
+++ b/source/blender/bmesh/intern/bmesh_delete.c
@@ -105,7 +105,7 @@ void BMO_mesh_delete_oflag_tagged(BMesh *bm, const short oflag, const char htype
 		bmo_remove_tagged_edges(bm, oflag);
 	}
 	if (htype & BM_VERT) {
-		bmo_remove_tagged_verts(bm, oflag);	
+		bmo_remove_tagged_verts(bm, oflag);
 	}
 }
 
diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c
index 54fe2801d0c..9e107c822ac 100644
--- a/source/blender/bmesh/intern/bmesh_edgeloop.c
+++ b/source/blender/bmesh/intern/bmesh_edgeloop.c
@@ -160,7 +160,7 @@ int BM_mesh_edgeloops_find(
 	BMEdge **edges = MEM_mallocN(sizeof(*edges) * edges_len, __func__);
 	BLI_stack_pop_n_reverse(edge_stack, edges, BLI_stack_count(edge_stack));
 	BLI_stack_free(edge_stack);
-	
+
 	for (uint i = 0; i < edges_len; i += 1) {
 		e = edges[i];
 		if (BM_elem_flag_test(e, BM_ELEM_INTERNAL_TAG)) {
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index 8a1090891f2..e3b779ddbcd 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -152,7 +152,7 @@ void BM_data_interp_face_vert_edge(
 			l_v = l_iter;
 			l_v2 = l_iter->prev;
 		}
-		
+
 		if (!l_v1 || !l_v2) {
 			return;
 		}
@@ -260,15 +260,15 @@ static int compute_mdisp_quad(
 
 	mid_v3_v3v3(p, l->prev->v->co, l->v->co);
 	mid_v3_v3v3(n, l->next->v->co, l->v->co);
-	
+
 	copy_v3_v3(v1, l_f_center);
 	copy_v3_v3(v2, p);
 	copy_v3_v3(v3, l->v->co);
 	copy_v3_v3(v4, n);
-	
+
 	sub_v3_v3v3(e1, v2, v1);
 	sub_v3_v3v3(e2, v3, v4);
-	
+
 	return 1;
 }
 
@@ -331,7 +331,7 @@ static bool mdisp_in_mdispquad(
 {
 	float v1[3], v2[3], c[3], v3[3], v4[3], e1[3], e2[3];
 	float eps = FLT_EPSILON * 4000;
-	
+
 	if (is_zero_v3(l_src->v->no))
 		BM_vert_normal_update_all(l_src->v);
 	if (is_zero_v3(l_dst->v->no))
@@ -341,17 +341,17 @@ static bool mdisp_in_mdispquad(
 
 	/* expand quad a bit */
 	mid_v3_v3v3v3v3(c, v1, v2, v3, v4);
-	
+
 	sub_v3_v3(v1, c); sub_v3_v3(v2, c);
 	sub_v3_v3(v3, c); sub_v3_v3(v4, c);
 	mul_v3_fl(v1, 1.0f + eps); mul_v3_fl(v2, 1.0f + eps);
 	mul_v3_fl(v3, 1.0f + eps); mul_v3_fl(v4, 1.0f + eps);
 	add_v3_v3(v1, c); add_v3_v3(v2, c);
 	add_v3_v3(v3, c); add_v3_v3(v4, c);
-	
+
 	if (!quad_co(v1, v2, v3, v4, p, l_src->v->no, r_uv))
 		return 0;
-	
+
 	mul_v2_fl(r_uv, (float)(res - 1));
 
 	mdisp_axis_from_quad(v1, v2, v3, v4, r_axis_x, r_axis_y);
@@ -478,14 +478,14 @@ void BM_loop_interp_multires_ex(
 	MDisps *md_dst;
 	float v1[3], v2[3], v3[3], v4[3] = {0.0f, 0.0f, 0.0f}, e1[3], e2[3];
 	float axis_x[3], axis_y[3];
-	
+
 	/* ignore 2-edged faces */
 	if (UNLIKELY(l_dst->f->len < 3))
 		return;
 
 	md_dst = BM_ELEM_CD_GET_VOID_P(l_dst, cd_loop_mdisp_offset);
 	compute_mdisp_quad(l_dst, f_dst_center, v1, v2, v3, v4, e1, e2);
-	
+
 	/* if no disps data allocate a new grid, the size of the first grid in f_src. */
 	if (!md_dst->totdisp) {
 		co

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list