[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21570] branches/bmesh/blender/source/ blender: inconsistent newline fixes
Joseph Eagar
joeedh at gmail.com
Tue Jul 14 10:37:04 CEST 2009
Revision: 21570
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21570
Author: joeedh
Date: 2009-07-14 10:37:02 +0200 (Tue, 14 Jul 2009)
Log Message:
-----------
inconsistent newline fixes
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators_private.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h 2009-07-14 06:13:43 UTC (rev 21569)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h 2009-07-14 08:37:02 UTC (rev 21570)
@@ -29,7 +29,7 @@
void BMOP_DupeFromFlag(struct BMesh *bm, int etypeflag, int flag);
void BM_esubdivideflag(struct Object *obedit, struct BMesh *bm, int selflag, float rad,
int flag, int numcuts, int seltype);
-void BM_esubdivideflag_conv(struct Object *obedit, struct EditMesh *em,
+void BM_esubdivideflag_conv(struct Object *obedit, struct EditMesh *em,
int selflag, float rad, int flag, int numcuts,
int seltype);
void BM_extrudefaceflag(BMesh *bm, int flag);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2009-07-14 06:13:43 UTC (rev 21569)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2009-07-14 08:37:02 UTC (rev 21570)
@@ -421,26 +421,26 @@
BMFace *f, *f2;
BMIter iter, liter;
- int allocsize[4] = {512,512,2048,512}, numTex, numCol;
- int i;
-
- /*allocate a bmesh*/
+ int allocsize[4] = {512,512,2048,512}, numTex, numCol;
+ int i;
+
+ /*allocate a bmesh*/
bm = BM_Make_Mesh(allocsize);
- CustomData_copy(&bmold->vdata, &bm->vdata, CD_MASK_BMESH, CD_CALLOC, 0);
- CustomData_copy(&bmold->edata, &bm->edata, CD_MASK_BMESH, CD_CALLOC, 0);
+ CustomData_copy(&bmold->vdata, &bm->vdata, CD_MASK_BMESH, CD_CALLOC, 0);
+ CustomData_copy(&bmold->edata, &bm->edata, CD_MASK_BMESH, CD_CALLOC, 0);
CustomData_copy(&bmold->ldata, &bm->ldata, CD_MASK_BMESH, CD_CALLOC, 0);
- CustomData_copy(&bmold->pdata, &bm->pdata, CD_MASK_BMESH, CD_CALLOC, 0);
+ CustomData_copy(&bmold->pdata, &bm->pdata, CD_MASK_BMESH, CD_CALLOC, 0);
- CustomData_bmesh_init_pool(&bm->vdata, allocsize[0]);
- CustomData_bmesh_init_pool(&bm->edata, allocsize[1]);
- CustomData_bmesh_init_pool(&bm->ldata, allocsize[2]);
- CustomData_bmesh_init_pool(&bm->pdata, allocsize[3]);
+ CustomData_bmesh_init_pool(&bm->vdata, allocsize[0]);
+ CustomData_bmesh_init_pool(&bm->edata, allocsize[1]);
+ CustomData_bmesh_init_pool(&bm->ldata, allocsize[2]);
+ CustomData_bmesh_init_pool(&bm->pdata, allocsize[3]);
- /*needed later*/
- numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
- numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
-
+ /*needed later*/
+ numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
+ numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
+
v = BMIter_New(&iter, bmold, BM_VERTS_OF_MESH, NULL);
for (i=0; v; v=BMIter_Step(&iter), i++) {
v2 = BM_Make_Vert(bm, v->co, NULL);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators_private.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators_private.h 2009-07-14 06:13:43 UTC (rev 21569)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators_private.h 2009-07-14 08:37:02 UTC (rev 21570)
@@ -27,8 +27,8 @@
void bmesh_transform_exec(BMesh *bm, BMOperator *op);
void bmesh_contextual_create_exec(BMesh *bm, BMOperator *op);
void bmesh_edgenet_fill_exec(BMesh *bm, BMOperator *op);
-void bmesh_rotate_exec(BMesh *bm, BMOperator *op);
-void bmesh_makevert_exec(BMesh *bm, BMOperator *op);
+void bmesh_rotate_exec(BMesh *bm, BMOperator *op);
+void bmesh_makevert_exec(BMesh *bm, BMOperator *op);
void dissolveedges_exec(BMesh *bm, BMOperator *op);
void dissolve_edgeloop_exec(BMesh *bm, BMOperator *op);
void bmesh_weldverts_exec(BMesh *bm, BMOperator *op);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c 2009-07-14 06:13:43 UTC (rev 21569)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c 2009-07-14 08:37:02 UTC (rev 21570)
@@ -474,18 +474,18 @@
{
int w1, w2, w3, w4, w5;
-/* int test1_a, test1_a, test2_a, test2_a;
-
- test1_a = check_tri_clock_dir(l1p1, l1p2, l2p1);
- test1_b = check_tri_clock_dir(l1p1, l1p2, l2p2);
- if (test1_a != test1_b)
- {
- test2_a = check_tri_clock_dir(l2p1, l2p2, l1p1);
- test2_b = check_tri_clock_dir(l2p1, l2p2, l1p2);
- if (test2_a != test2_b)
- {
- return 1;
- }
+/* int test1_a, test1_a, test2_a, test2_a;
+
+ test1_a = check_tri_clock_dir(l1p1, l1p2, l2p1);
+ test1_b = check_tri_clock_dir(l1p1, l1p2, l2p2);
+ if (test1_a != test1_b)
+ {
+ test2_a = check_tri_clock_dir(l2p1, l2p2, l1p1);
+ test2_b = check_tri_clock_dir(l2p1, l2p2, l1p2);
+ if (test2_a != test2_b)
+ {
+ return 1;
+ }
}*/
/*w1 = testedgesidef(v1, v2, v3);
w2 = testedgesidef(v1, v2, v4);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2009-07-14 06:13:43 UTC (rev 21569)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2009-07-14 08:37:02 UTC (rev 21570)
@@ -34,7 +34,7 @@
* comment if it already is. -joeedh
*
*/
-
+
void mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) {
Mesh *me = BMO_Get_Pnt(op, "mesh");
MVert *mvert;
@@ -53,10 +53,10 @@
vt = MEM_mallocN(sizeof(void**)*me->totvert, "mesh to bmesh vtable");
- CustomData_copy(&bm->vdata, &me->vdata, CD_MASK_BMESH, CD_CALLOC, 0);
- CustomData_copy(&bm->edata, &me->edata, CD_MASK_BMESH, CD_CALLOC, 0);
- CustomData_copy(&bm->ldata, &me->ldata, CD_MASK_BMESH, CD_CALLOC, 0);
- CustomData_copy(&bm->pdata, &me->pdata, CD_MASK_BMESH, CD_CALLOC, 0);
+ CustomData_copy(&bm->vdata, &me->vdata, CD_MASK_BMESH, CD_CALLOC, 0);
+ CustomData_copy(&bm->edata, &me->edata, CD_MASK_BMESH, CD_CALLOC, 0);
+ CustomData_copy(&bm->ldata, &me->ldata, CD_MASK_BMESH, CD_CALLOC, 0);
+ CustomData_copy(&bm->pdata, &me->pdata, CD_MASK_BMESH, CD_CALLOC, 0);
CustomData_bmesh_init_pool(&bm->vdata, allocsize[0]);
CustomData_bmesh_init_pool(&bm->edata, allocsize[1]);
@@ -152,28 +152,28 @@
BMIter iter, liter;
int i, j, ototvert, totloop, numTex, numCol;
- numTex = CustomData_number_of_layers(&me->pdata, CD_MLOOPUV);
- numCol = CustomData_number_of_layers(&me->ldata, CD_MLOOPCOL);
+ numTex = CustomData_number_of_layers(&me->pdata, CD_MLOOPUV);
+ numCol = CustomData_number_of_layers(&me->ldata, CD_MLOOPCOL);
bmtess = BM_Copy_Mesh(bm);
BMO_CallOpf(bmtess, "makefgon trifan=%i", 0);
- /* new Vertex block */
- 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");
-
- /* new Face block */
- if(bmtess->totface==0) mface= NULL;
- else mface= MEM_callocN(bmtess->totface*sizeof(MFace), "loadeditbMesh face");
-
+ /* new Vertex block */
+ 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");
+
+ /* new Face block */
+ if(bmtess->totface==0) mface= NULL;
+ else mface= MEM_callocN(bmtess->totface*sizeof(MFace), "loadeditbMesh face");
+
/*build ngon data*/
- /* new Ngon Face block */
- if(bm->totface==0) mpoly = NULL;
- else mpoly= MEM_callocN(bm->totface*sizeof(MPoly), "loadeditbMesh poly");
+ /* new Ngon Face block */
+ if(bm->totface==0) mpoly = NULL;
+ else mpoly= MEM_callocN(bm->totface*sizeof(MPoly), "loadeditbMesh poly");
/*find number of loops to allocate*/
totloop = 0;
@@ -183,42 +183,42 @@
if (totloop==0) mloop = NULL;
else mloop = MEM_callocN(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 */
- oldverts= me->mvert;
-
- /* don't free this yet */
- CustomData_set_layer(&me->vdata, CD_MVERT, NULL);
-
- /* free custom data */
- CustomData_free(&me->vdata, me->totvert);
- CustomData_free(&me->edata, me->totedge);
- CustomData_free(&me->fdata, me->totface);
- CustomData_free(&me->ldata, me->totloop);
- CustomData_free(&me->pdata, me->totpoly);
-
- /* add new custom data */
- me->totvert= bm->totvert;
- me->totedge= bm->totedge;
- me->totface= bmtess->totface;
- me->totloop= totloop;
- me->totpoly= bm->totface;
-
- CustomData_copy(&bm->vdata, &me->vdata, CD_MASK_MESH, CD_CALLOC, me->totvert);
- CustomData_copy(&bm->edata, &me->edata, CD_MASK_MESH, CD_CALLOC, me->totedge);
- CustomData_copy(&bm->ldata, &me->ldata, CD_MASK_MESH, CD_CALLOC, me->totloop);
- CustomData_copy(&bm->pdata, &me->pdata, CD_MASK_MESH, CD_CALLOC, me->totpoly);
-
- CustomData_add_layer(&me->vdata, CD_MVERT, CD_ASSIGN, mvert, me->totvert);
- CustomData_add_layer(&me->edata, CD_MEDGE, CD_ASSIGN, medge, me->totedge);
- CustomData_add_layer(&me->fdata, CD_MFACE, CD_ASSIGN, mface, me->totface);
- CustomData_add_layer(&me->ldata, CD_MLOOP, CD_ASSIGN, mloop, me->totloop);
- CustomData_add_layer(&me->pdata, CD_MPOLY, CD_ASSIGN, mpoly, me->totpoly);
-
- CustomData_from_bmeshpoly(&me->fdata, &bmtess->pdata, &bmtess->ldata, bmtess->totface);
-
- mesh_update_customdata_pointers(me);
+
+ /* 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 */
+ oldverts= me->mvert;
+
+ /* don't free this yet */
+ CustomData_set_layer(&me->vdata, CD_MVERT, NULL);
+
+ /* free custom data */
+ CustomData_free(&me->vdata, me->totvert);
+ CustomData_free(&me->edata, me->totedge);
+ CustomData_free(&me->fdata, me->totface);
+ CustomData_free(&me->ldata, me->totloop);
+ CustomData_free(&me->pdata, me->totpoly);
+
+ /* add new custom data */
+ me->totvert= bm->totvert;
+ me->totedge= bm->totedge;
+ me->totface= bmtess->totface;
+ me->totloop= totloop;
+ me->totpoly= bm->totface;
+
+ CustomData_copy(&bm->vdata, &me->vdata, CD_MASK_MESH, CD_CALLOC, me->totvert);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list