1 files changed, 25 insertions, 25 deletions

diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 543895a5973..9e8767406b1 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -629,6 +629,12 @@ static void make_edges_mdata(MVert *allvert, MFace *allface, int totvert, int to
 			medge->v2= ed->v2;
 			if(old==0 || ed->is_draw) medge->flag= ME_EDGEDRAW|ME_EDGERENDER;
 			if(ed->is_loose) medge->flag|= ME_LOOSEEDGE;
+
+			/* order is swapped so extruding this edge as a surface wont flip face normals
+			 * with cyclic curves */
+			if(ed->v1+1 != ed->v2) {
+				SWAP(int, medge->v1, medge->v2);
+			}
 			medge++;
 		}
 		else {
@@ -768,11 +774,8 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int
 			totvlak+= dl->parts*(dl->nr-1);
 		}
 		else if(dl->type==DL_POLY) {
-			/* cyclic polys are filled. except when 3D */
-			if(cu->flag & CU_3D) {
-				totvert+= dl->parts*dl->nr;
-				totvlak+= dl->parts*dl->nr;
-			}
+			totvert+= dl->parts*dl->nr;
+			totvlak+= dl->parts*dl->nr;
 		}
 		else if(dl->type==DL_SURF) {
 			totvert+= dl->parts*dl->nr;
@@ -824,27 +827,24 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int
 
 		}
 		else if(dl->type==DL_POLY) {
-			/* 3d polys are not filled */
-			if(cu->flag & CU_3D) {
-				startvert= vertcount;
-				a= dl->parts*dl->nr;
-				data= dl->verts;
-				while(a--) {
-					VECCOPY(mvert->co, data);
-					data+=3;
-					vertcount++;
-					mvert++;
-				}
+			startvert= vertcount;
+			a= dl->parts*dl->nr;
+			data= dl->verts;
+			while(a--) {
+				VECCOPY(mvert->co, data);
+				data+=3;
+				vertcount++;
+				mvert++;
+			}
 
-				for(a=0; a<dl->parts; a++) {
-					ofs= a*dl->nr;
-					for(b=0; b<dl->nr; b++) {
-						mface->v1= startvert+ofs+b;
-						if(b==dl->nr-1) mface->v2= startvert+ofs;
-						else mface->v2= startvert+ofs+b+1;
-						if(smooth) mface->flag |= ME_SMOOTH;
-						mface++;
-					}
+			for(a=0; a<dl->parts; a++) {
+				ofs= a*dl->nr;
+				for(b=0; b<dl->nr; b++) {
+					mface->v1= startvert+ofs+b;
+					if(b==dl->nr-1) mface->v2= startvert+ofs;
+					else mface->v2= startvert+ofs+b+1;
+					if(smooth) mface->flag |= ME_SMOOTH;
+					mface++;
 				}
 			}
 		}