[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44023] branches/bmesh/blender/source/ blender/bmesh: Style Cleanup:

Campbell Barton ideasman42 at gmail.com
Sat Feb 11 05:00:32 CET 2012


Revision: 44023
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44023
Author:   campbellbarton
Date:     2012-02-11 04:00:18 +0000 (Sat, 11 Feb 2012)
Log Message:
-----------
Style Cleanup:

also remove editmesh/bmesh conversion files, these wont ever be used and dont contain anything useful as examples.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c

Removed Paths:
-------------
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_to_editmesh.c
    branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c

Modified: branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt	2012-02-11 03:34:57 UTC (rev 44022)
+++ branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt	2012-02-11 04:00:18 UTC (rev 44023)
@@ -90,9 +90,7 @@
 	intern/bmesh_mods.c
 	intern/bmesh_structure.h
 	intern/bmesh_construct.c
-	intern/bmesh_to_editmesh.c
 	intern/bmesh_operators_private.h
-	intern/editmesh_to_bmesh.c
 	intern/bmesh_structure.c
 	intern/bmesh_polygon.c
 	intern/bmesh_queries.c

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c	2012-02-11 03:34:57 UTC (rev 44022)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c	2012-02-11 04:00:18 UTC (rev 44023)
@@ -5,7 +5,6 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * about this.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2007 Blender Foundation.
  * All rights reserved.
@@ -183,9 +182,9 @@
 		else {
 			if (!edar[2]) edar[2] = BM_Make_Edge(bm, verts[2], verts[0], NULL, FALSE);
 		}
-	
+
 		f = BM_Make_Face(bm, verts, edar, len, FALSE);
-	
+
 		if (example && f) {
 			BM_Copy_Attributes(bm, bm, example, f);
 		}
@@ -799,9 +798,9 @@
 /* ME -> BM */
 char BM_Vert_Flag_From_MEFlag(const char  meflag)
 {
-    return ( ((meflag & SELECT)       ? BM_SELECT : 0) |
-             ((meflag & ME_HIDE)      ? BM_HIDDEN : 0)
-             );
+	return ( ((meflag & SELECT)       ? BM_SELECT : 0) |
+	         ((meflag & ME_HIDE)      ? BM_HIDDEN : 0)
+	         );
 }
 char BM_Edge_Flag_From_MEFlag(const short meflag)
 {
@@ -813,20 +812,20 @@
 }
 char BM_Face_Flag_From_MEFlag(const char  meflag)
 {
-    return ( ((meflag & ME_FACE_SEL)  ? BM_SELECT : 0) |
-             ((meflag & ME_SMOOTH)    ? BM_SMOOTH : 0) |
-             ((meflag & ME_HIDE)      ? BM_HIDDEN : 0)
-             );
+	return ( ((meflag & ME_FACE_SEL)  ? BM_SELECT : 0) |
+	         ((meflag & ME_SMOOTH)    ? BM_SMOOTH : 0) |
+	         ((meflag & ME_HIDE)      ? BM_HIDDEN : 0)
+	         );
 }
 
 /* BM -> ME */
 char  BM_Vert_Flag_To_MEFlag(BMVert *eve)
 {
-    const char hflag = eve->head.hflag;
+	const char hflag = eve->head.hflag;
 
-    return ( ((hflag & BM_SELECT)  ? SELECT  : 0) |
-             ((hflag & BM_HIDDEN)  ? ME_HIDE : 0)
-             );
+	return ( ((hflag & BM_SELECT)  ? SELECT  : 0) |
+	         ((hflag & BM_HIDDEN)  ? ME_HIDE : 0)
+	         );
 }
 short BM_Edge_Flag_To_MEFlag(BMEdge *eed)
 {
@@ -842,12 +841,12 @@
 }
 char  BM_Face_Flag_To_MEFlag(BMFace *efa)
 {
-    const char hflag = efa->head.hflag;
+	const char hflag = efa->head.hflag;
 
-    return ( ((hflag & BM_SELECT) ? ME_FACE_SEL : 0) |
-             ((hflag & BM_SMOOTH) ? ME_SMOOTH   : 0) |
-             ((hflag & BM_HIDDEN) ? ME_HIDE     : 0)
-             );
+	return ( ((hflag & BM_SELECT) ? ME_FACE_SEL : 0) |
+	         ((hflag & BM_SMOOTH) ? ME_SMOOTH   : 0) |
+	         ((hflag & BM_HIDDEN) ? ME_HIDE     : 0)
+	         );
 }
 
 /* unused, type spesific functions below */

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c	2012-02-11 03:34:57 UTC (rev 44022)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c	2012-02-11 04:00:18 UTC (rev 44023)
@@ -108,7 +108,7 @@
  *  Returns -
  *	Nothing
  */
- 
+
 void BM_Data_Facevert_Edgeinterp(BMesh *bm, BMVert *v1, BMVert *UNUSED(v2), BMVert *v, BMEdge *e1, float fac)
 {
 	void *src[2];
@@ -342,7 +342,7 @@
 MINLINE double line_point_side_v2_d(const double *l1, const double *l2, const double *pt)
 {
 	return	((l1[0] - pt[0]) * (l2[1] - pt[1])) -
-			((l2[0] - pt[0]) * (l1[1] - pt[1]));
+	        ((l2[0] - pt[0]) * (l1[1] - pt[1]));
 }
 
 /* point in quad - only convex quads */
@@ -371,16 +371,16 @@
 }
 
 /***** multires interpolation*****
-
-mdisps is a grid of displacements, ordered thus:
-
- v1/center----v4/next -> x
-     |           |
-     |           |
-  v2/prev------v3/cur
-     |
-     V
-     y
+ *
+ * mdisps is a grid of displacements, ordered thus:
+ *
+ *  v1/center----v4/next -> x
+ *      |           |
+ *      |           |
+ *   v2/prev------v3/cur
+ *      |
+ *      V
+ *      y
  */
 
 static int compute_mdisp_quad(BMLoop *l, double v1[3], double v2[3], double v3[3], double v4[3],
@@ -515,7 +515,7 @@
 		BM_Vert_UpdateAllNormals(bm, l->v);
 	if (len_v3(tl->v->no) == 0.0f)
 		BM_Vert_UpdateAllNormals(bm, tl->v);
-		
+
 	compute_mdisp_quad(tl, v1, v2, v3, v4, e1, e2);
 
 	/* expand quad a bit */
@@ -533,7 +533,7 @@
 	
 	*x *= res - 1;
 	*y *= res - 1;
-		  
+
 	return 1;
 }
 
@@ -642,7 +642,7 @@
 		 *             V
 		 *             y
 		 */
-		  
+
 		sides = (int)sqrt(mdp->totdisp);
 		for (y = 0; y < sides; y++) {
 			add_v3_v3v3(co1, mdn->disps[y * sides], mdl->disps[y]);
@@ -673,7 +673,7 @@
 		 *             V
 		 *             y
 		 */
-		 
+
 		if (l->radial_next == l)
 			continue;
 
@@ -681,7 +681,7 @@
 			mdl2 = CustomData_bmesh_get(&bm->ldata, l->radial_next->head.data, CD_MDISPS);
 		else
 			mdl2 = CustomData_bmesh_get(&bm->ldata, l->radial_next->next->head.data, CD_MDISPS);
-			
+
 		sides = (int)sqrt(mdl1->totdisp);
 		for (y = 0; y < sides; y++) {
 			int a1, a2, o1, o2;
@@ -820,7 +820,7 @@
 	} while ((l_iter = l_iter->next) != l_first);
 
 	/* scale source face coordinates a bit, so points sitting directonly on an
-     * edge will work. */
+	 * edge will work. */
 	mul_v3_fl(cent, 1.0f / (float)source->len);
 	for (i = 0; i < source->len; i++) {
 		float vec[3];

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2012-02-11 03:34:57 UTC (rev 44022)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2012-02-11 04:00:18 UTC (rev 44023)
@@ -83,7 +83,7 @@
 
 	bm->ob = ob;
 	
-   /* allocate the memory pools for the mesh elements */
+	/* allocate the memory pools for the mesh elements */
 	bm->vpool = BLI_mempool_create(vsize, allocsize[0], allocsize[0], FALSE, TRUE);
 	bm->epool = BLI_mempool_create(esize, allocsize[1], allocsize[1], FALSE, TRUE);
 	bm->lpool = BLI_mempool_create(lsize, allocsize[2], allocsize[2], FALSE, FALSE);
@@ -136,7 +136,7 @@
 	if (bm->ldata.totlayer) BLI_mempool_destroy(bm->ldata.pool);
 	if (bm->pdata.totlayer) BLI_mempool_destroy(bm->pdata.pool);
 
- 	/* free custom data */
+	/* free custom data */
 	CustomData_free(&bm->vdata, 0);
 	CustomData_free(&bm->edata, 0);
 	CustomData_free(&bm->ldata, 0);
@@ -185,7 +185,7 @@
 
 	bm->ob = ob;
 	
-   /* allocate the memory pools for the mesh elements */
+	/* allocate the memory pools for the mesh elements */
 	bm->vpool = BLI_mempool_create(vsize, allocsize[0], allocsize[0], FALSE, TRUE);
 	bm->epool = BLI_mempool_create(esize, allocsize[1], allocsize[1], FALSE, TRUE);
 	bm->lpool = BLI_mempool_create(lsize, allocsize[2], allocsize[2], FALSE, FALSE);
@@ -609,8 +609,8 @@
 #ifdef DEBUG
 	if (is_any_error == 0) {
 		fprintf(stderr,
-				"Valid Index Success: at %s, %s, '%s', '%s'\n",
-				location, func, msg_a, msg_b);
+		        "Valid Index Success: at %s, %s, '%s', '%s'\n",
+		        location, func, msg_a, msg_b);
 	}
 #endif
 #endif

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-02-11 03:34:57 UTC (rev 44022)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-02-11 04:00:18 UTC (rev 44023)
@@ -256,7 +256,7 @@
  * Returns:
  *	 pointer to the combined face
  */
- 
+
 BMFace *BM_Join_TwoFaces(BMesh *bm, BMFace *f1, BMFace *f2, BMEdge *e)
 {
 	BMLoop *l1, *l2;
@@ -362,7 +362,7 @@
 	if (nf) {
 		BM_Copy_Attributes(bm, bm, f, nf);
 		copy_v3_v3(nf->no, f->no);
-	
+
 		/* handle multires update */
 		if (has_mdisp && (nf != f)) {
 			BMLoop *l_iter;
@@ -709,18 +709,18 @@
 }
 
 /*
-            BM Rotate Edge
-
-    Spins an edge topologically, either counter-clockwise or clockwise.
-    If ccw is true, the edge is spun counter-clockwise, otherwise it is
-    spun clockwise.
-    
-    Returns the spun edge.  Note that this works by dissolving the edge
-    then re-creating it, so the returned edge won't have the same pointer
-    address as the original one.
-
-    Returns NULL on error (e.g., if the edge isn't surrounded by exactly
-    two faces).
+ *         BM Rotate Edge
+ *
+ * Spins an edge topologically, either counter-clockwise or clockwise.
+ * If ccw is true, the edge is spun counter-clockwise, otherwise it is
+ * spun clockwise.
+ *
+ * Returns the spun edge.  Note that this works by dissolving the edge
+ * then re-creating it, so the returned edge won't have the same pointer
+ * address as the original one.
+ *
+ * Returns NULL on error (e.g., if the edge isn't surrounded by exactly
+ * two faces).
  */
 BMEdge *BM_Rotate_Edge(BMesh *bm, BMEdge *e, int ccw)
 {

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c	2012-02-11 03:34:57 UTC (rev 44022)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c	2012-02-11 04:00:18 UTC (rev 44023)
@@ -339,103 +339,103 @@
 		return 2;
 	
 	switch (htype) {
-	case BM_VERT: {
-		BMVert *v = element;
-		if (v->e && v->e->head.htype != BM_EDGE) {
-			err |= 4;
+		case BM_VERT: {
+			BMVert *v = element;
+			if (v->e && v->e->head.htype != BM_EDGE) {
+				err |= 4;
+			}
+			break;
 		}
-		break;
-	}

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list