[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23755] trunk/blender/source/blender/ blenkernel/intern/mesh.c: Fixing mixed code and declaration.
Martin Poirier
theeth at yahoo.com
Sat Oct 10 05:29:07 CEST 2009
Revision: 23755
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23755
Author: theeth
Date: 2009-10-10 05:29:03 +0200 (Sat, 10 Oct 2009)
Log Message:
-----------
Fixing mixed code and declaration.
PEOPLE, PLEASE CHECK YOUR WARNINGS BEFORE COMMIT
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mesh.c
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2009-10-09 23:34:52 UTC (rev 23754)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2009-10-10 03:29:03 UTC (rev 23755)
@@ -996,6 +996,10 @@
EdgeHash *eh = BLI_edgehash_new();
EdgeHash *eh_edge = BLI_edgehash_new();
+ ListBase edges = {NULL, NULL};
+ EdgeLink *edl;
+
+
mf= mface;
for (i = 0; i < totface; i++, mf++) {
if (!BLI_edgehash_haskey(eh, mf->v1, mf->v2))
@@ -1014,9 +1018,6 @@
}
}
- ListBase edges = {NULL, NULL};
- EdgeLink *edl;
-
med= medge;
for(i=0; i<totedge; i++, med++) {
if (!BLI_edgehash_haskey(eh, med->v1, med->v2)) {
@@ -1042,20 +1043,24 @@
MEdge *med_current= ((EdgeLink *)edges.last)->edge;
int startVert= med_current->v1;
int endVert= med_current->v2;
+ int ok= TRUE;
+ Nurb *nu;
+ BPoint *bp;
+ VertLink *vl;
+
appendPolyLineVert(&polyline, startVert); totpoly++;
appendPolyLineVert(&polyline, endVert); totpoly++;
BLI_freelinkN(&edges, edges.last); totedges--;
- int ok= TRUE;
while(ok) {
ok = FALSE;
i= totedges;
while(i) {
+ MEdge *ed= edl->edge;
i-=1;
edl= BLI_findlink(&edges, i);
- MEdge *ed= edl->edge;
if(ed->v1==endVert) {
endVert = ed->v2;
@@ -1092,8 +1097,6 @@
}
/* --- nurbs --- */
- Nurb *nu;
- BPoint *bp;
/* create new 'nurb' within the curve */
nu = (Nurb *)MEM_callocN(sizeof(Nurb), "MeshNurb");
@@ -1107,7 +1110,7 @@
nu->bp= (BPoint *)MEM_callocN(sizeof(BPoint)*totpoly, "bpoints");
/* add points */
- VertLink *vl= polyline.first;
+ vl= polyline.first;
for (i=0, bp=nu->bp; i < totpoly; i++, bp++, vl=vl->next) {
VecCopyf(bp->vec, mverts[vl->index].co);
bp->f1= SELECT;
More information about the Bf-blender-cvs
mailing list