Evil commit! Nothing really changed except;

- EditVlak -> EditFace
- variables called 'evl' -> 'efa'
- functions with 'vlak' in it now have 'face'

Just thought was nice starter for editmesh recode...

3 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 932eccb2357..dfae3c6b12b 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -113,7 +113,7 @@ DispListMesh *displistmesh_from_editmesh(EditMesh *em)
 	DispListMesh *dlm= MEM_callocN(sizeof(*dlm),"dlm");
 	EditVert *eve, *evePrev;
 	EditEdge *eed;
-	EditVlak *evl;
+	EditFace *evl;
 	MFace *mfNew;
 	int i;
 
@@ -1457,7 +1457,7 @@ static void curve_to_displist(ListBase *nubase, ListBase *dispbase)
 static void filldisplist(ListBase *dispbase, ListBase *to)
 {
 	EditVert *eve, *v1, *vlast;
-	EditVlak *evl;
+	EditFace *evl;
 	DispList *dlnew=0, *dl;
 	float *f1;
 	int colnr=0, cont=1, tot, a, *index;
@@ -1519,9 +1519,9 @@ static void filldisplist(ListBase *dispbase, ListBase *to)
 
 		if(totvert && BLI_edgefill(0)!=0) {
 
-			/* count faces (vlak in dutch!) */
+			/* count faces  */
 			tot= 0;
-			evl= fillvlakbase.first;
+			evl= fillfacebase.first;
 			while(evl) {
 				tot++;
 				evl= evl->next;
@@ -1553,7 +1553,7 @@ static void filldisplist(ListBase *dispbase, ListBase *to)
 				}
 				
 				/* index data */
-				evl= fillvlakbase.first;
+				evl= fillfacebase.first;
 				index= dlnew->index;
 				while(evl) {
 					index[0]= (long)evl->v1->vn;
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c
index 7c93de76c2a..5348aea6e2a 100644
--- a/source/blender/blenkernel/intern/exotic.c
+++ b/source/blender/blenkernel/intern/exotic.c
@@ -1942,7 +1942,7 @@ static void displist_to_mesh(DispList *dlfirst)
 	MVert *mvert;
 	MFace *mface;
 	float *data, vec[3], min[3], max[3];
-	int a, b, startve, *idata, totedge=0, tottria=0, totquad=0, totvert=0, totvlak, totcol=0, colnr;
+	int a, b, startve, *idata, totedge=0, tottria=0, totquad=0, totvert=0, totface, totcol=0, colnr;
 	int p1, p2, p3, p4;
 		
 	/* count first */
@@ -2096,14 +2096,14 @@ static void displist_to_mesh(DispList *dlfirst)
 		}
 	}
 	
-	totvlak= totquad+tottria+totedge;
+	totface= totquad+tottria+totedge;
 
-	printf("Import: %d vertices %d faces\n", totvert, totvlak);
+	printf("Import: %d vertices %d faces\n", totvert, totface);
 	
 	if(totvert) me->mvert= MEM_callocN(totvert*sizeof(MVert), "mvert");
-	if(totvlak) me->mface= MEM_callocN(totvlak*sizeof(MFace), "mface");
+	if(totface) me->mface= MEM_callocN(totface*sizeof(MFace), "mface");
 	me->totvert= totvert;
-	me->totface= totvlak;
+	me->totface= totface;
 	
 	mvert= me->mvert;
 	mface= me->mface;
@@ -2682,7 +2682,7 @@ static void write_videoscape_mesh(Object *ob, char *str)
 	MFace *mface;
 	FILE *fp;
 	EditVert *eve;
-	EditVlak *evl;
+	EditFace *evl;
 	unsigned int kleur[32];
 	float co[3];
 	int a;
diff --git a/source/blender/blenkernel/intern/subsurf.c b/source/blender/blenkernel/intern/subsurf.c
index 4a8724272b7..93ef1fa870c 100644
--- a/source/blender/blenkernel/intern/subsurf.c
+++ b/source/blender/blenkernel/intern/subsurf.c
@@ -206,7 +206,7 @@ struct _HyperFace {
 		/* for getting back tface, matnr, etc */
 	union {
 		int ind;
-		EditVlak *ef;
+		EditFace *ef;
 	} orig;
 };
 
@@ -423,7 +423,7 @@ static HyperMesh *hypermesh_from_editmesh(EditMesh *em, int subdivLevels) {
 	HyperMesh *hme= hypermesh_new();
 	EditVert *ev, *prevev;
 	EditEdge *ee;
-	EditVlak *ef;
+	EditFace *ef;
 	float creasefac= (float)subdivLevels;
 	int flag;
 
@@ -1021,7 +1021,7 @@ static DispListMesh *hypermesh_to_displistmesh(HyperMesh *hme, short flag) {
 			mf->flag= origmf->flag;
 			mf->puno= 0;
 		} else {
-			EditVlak *origef= f->orig.ef;
+			EditFace *origef= f->orig.ef;
 			
 			mf->mat_nr= origef->mat_nr;
 			mf->flag= origef->flag;