dont use tface hide or select anymore, since maintaining 2 sets of hide/select data for each face is annoying.

using mface->flag for both.

Also found that the cdDM_drawMappedFaces and cdDM_drawFacesTex_common could get normals mixed up when rendering hidden faces. because hidden/invisible faces used continue without advancing to the next normal.

4 files changed, 59 insertions, 58 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 38762d8f49a..fa8f76178d5 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -572,7 +572,7 @@ static void emDM_drawUVEdges(DerivedMesh *dm)
 	for(efa= emdm->em->faces.first; efa; efa= efa->next) {
 		tf = CustomData_em_get(&emdm->em->fdata, efa->data, CD_MTFACE);
 
-		if(tf && !(tf->flag&TF_HIDE)) {
+		if(tf && !(efa->h)) {
 			glVertex2fv(tf->uv[0]);
 			glVertex2fv(tf->uv[1]);
 
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index c983f6b48e5..2d5f5f091c3 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -177,14 +177,14 @@ static void cdDM_drawVerts(DerivedMesh *dm)
 static void cdDM_drawUVEdges(DerivedMesh *dm)
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
-	MTFace *tf = DM_get_face_data_layer(dm, CD_MTFACE);
 	MFace *mf = cddm->mface;
+	MTFace *tf = DM_get_face_data_layer(dm, CD_MTFACE);
 	int i;
 
-	if(tf) {
+	if(mf) {
 		glBegin(GL_LINES);
-		for(i = 0; i < dm->numFaceData; i++, tf++, mf++) {
-			if(!(tf->flag&TF_HIDE)) {
+		for(i = 0; i < dm->numFaceData; i++, mf++, tf++) {
+			if(!(mf->flag&ME_HIDE)) {
 				glVertex2fv(tf->uv[0]);
 				glVertex2fv(tf->uv[1]);
 
@@ -399,67 +399,67 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
 		else {
 			if(index) {
 				orig = *index++;
-				if(orig == ORIGINDEX_NONE) continue;
+				if(orig == ORIGINDEX_NONE)		{ if(nors) nors += 3; continue; }
 				if(drawParamsMapped) flag = drawParamsMapped(userData, orig);
-				else continue;
+				else	{ if(nors) nors += 3; continue; }
 			}
 			else
 				if(drawParamsMapped) flag = drawParamsMapped(userData, i);
-				else continue;
+				else	{ if(nors) nors += 3; continue; }
 		}
+		
+		if(flag != 0) { /* if the flag is 0 it means the face is hidden or invisible */
+			if (flag==1 && mcol)
+				cp= (unsigned char*) &mcol[i*4];
 
-		if(flag == 0)
-			continue;
-		else if (flag==1 && mcol)
-			cp= (unsigned char*) &mcol[i*4];
-
-		if(!(mf->flag&ME_SMOOTH)) {
-			if (nors) {
-				glNormal3fv(nors);
-			}
-			else {
-				/* TODO make this better (cache facenormals as layer?) */
-				float nor[3];
-				if(mf->v4) {
-					CalcNormFloat4(mv[mf->v1].co, mv[mf->v2].co,
-								   mv[mf->v3].co, mv[mf->v4].co,
-								   nor);
-				} else {
-					CalcNormFloat(mv[mf->v1].co, mv[mf->v2].co,
-								  mv[mf->v3].co, nor);
+			if(!(mf->flag&ME_SMOOTH)) {
+				if (nors) {
+					glNormal3fv(nors);
+				}
+				else {
+					/* TODO make this better (cache facenormals as layer?) */
+					float nor[3];
+					if(mf->v4) {
+						CalcNormFloat4(mv[mf->v1].co, mv[mf->v2].co,
+									   mv[mf->v3].co, mv[mf->v4].co,
+									   nor);
+					} else {
+						CalcNormFloat(mv[mf->v1].co, mv[mf->v2].co,
+									  mv[mf->v3].co, nor);
+					}
+					glNormal3fv(nor);
 				}
-				glNormal3fv(nor);
 			}
-		}
 
-		glBegin(mf->v4?GL_QUADS:GL_TRIANGLES);
-		if(tf) glTexCoord2fv(tf[i].uv[0]);
-		if(cp) glColor3ub(cp[3], cp[2], cp[1]);
-		mvert = &mv[mf->v1];
-		if(mf->flag&ME_SMOOTH) glNormal3sv(mvert->no);
-		glVertex3fv(mvert->co);
-			
-		if(tf) glTexCoord2fv(tf[i].uv[1]);
-		if(cp) glColor3ub(cp[7], cp[6], cp[5]);
-		mvert = &mv[mf->v2];
-		if(mf->flag&ME_SMOOTH) glNormal3sv(mvert->no);
-		glVertex3fv(mvert->co);
-
-		if(tf) glTexCoord2fv(tf[i].uv[2]);
-		if(cp) glColor3ub(cp[11], cp[10], cp[9]);
-		mvert = &mv[mf->v3];
-		if(mf->flag&ME_SMOOTH) glNormal3sv(mvert->no);
-		glVertex3fv(mvert->co);
-
-		if(mf->v4) {
-			if(tf) glTexCoord2fv(tf[i].uv[3]);
-			if(cp) glColor3ub(cp[15], cp[14], cp[13]);
-			mvert = &mv[mf->v4];
+			glBegin(mf->v4?GL_QUADS:GL_TRIANGLES);
+			if(tf) glTexCoord2fv(tf[i].uv[0]);
+			if(cp) glColor3ub(cp[3], cp[2], cp[1]);
+			mvert = &mv[mf->v1];
+			if(mf->flag&ME_SMOOTH) glNormal3sv(mvert->no);
+			glVertex3fv(mvert->co);
+				
+			if(tf) glTexCoord2fv(tf[i].uv[1]);
+			if(cp) glColor3ub(cp[7], cp[6], cp[5]);
+			mvert = &mv[mf->v2];
 			if(mf->flag&ME_SMOOTH) glNormal3sv(mvert->no);
 			glVertex3fv(mvert->co);
-		}
-		glEnd();
 
+			if(tf) glTexCoord2fv(tf[i].uv[2]);
+			if(cp) glColor3ub(cp[11], cp[10], cp[9]);
+			mvert = &mv[mf->v3];
+			if(mf->flag&ME_SMOOTH) glNormal3sv(mvert->no);
+			glVertex3fv(mvert->co);
+
+			if(mf->v4) {
+				if(tf) glTexCoord2fv(tf[i].uv[3]);
+				if(cp) glColor3ub(cp[15], cp[14], cp[13]);
+				mvert = &mv[mf->v4];
+				if(mf->flag&ME_SMOOTH) glNormal3sv(mvert->no);
+				glVertex3fv(mvert->co);
+			}
+			glEnd();
+		}
+		
 		if(nors) nors += 3;
 	}
 }
@@ -483,7 +483,8 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us
 
 		if(index) {
 			orig = *index++;
-			if(setDrawOptions && orig == ORIGINDEX_NONE) continue;
+			if(setDrawOptions && orig == ORIGINDEX_NONE)
+				{ if(nors) nors += 3; continue; }
 		}
 		else
 			orig = i;
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 033c1b26471..68319b799a2 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -272,7 +272,7 @@ static void layerSwap_tface(void *data, int *corner_indices)
 static void layerDefault_tface(void *data, int count)
 {
 	static MTFace default_tf = {{{0, 1}, {0, 0}, {1, 0}, {1, 1}}, NULL,
-	                           TF_SELECT, 0, TF_DYNAMIC, 0, 0};
+	                           0, 0, TF_DYNAMIC, 0, 0};
 	MTFace *tf = (MTFace*)data;
 	int i;
 
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 7da2454b474..93a3981c4a9 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -1150,7 +1150,7 @@ UvVertMap *make_uv_vert_map(struct MFace *mface, struct MTFace *tface, unsigned
 	mf= mface;
 	tf= tface;
 	for(a=0; a<totface; a++, mf++, tf++)
-		if(!selected || (!(tf->flag & TF_HIDE) && (tf->flag & TF_SELECT)))
+		if(!selected || (!(mf->flag & ME_HIDE) && (mf->flag & ME_FACE_SEL)))
 			totuv += (mf->v4)? 4: 3;
 		
 	if(totuv==0)
@@ -1171,7 +1171,7 @@ UvVertMap *make_uv_vert_map(struct MFace *mface, struct MTFace *tface, unsigned
 	mf= mface;
 	tf= tface;
 	for(a=0; a<totface; a++, mf++, tf++) {
-		if(!selected || (!(tf->flag & TF_HIDE) && (tf->flag & TF_SELECT))) {
+		if(!selected || (!(mf->flag & ME_HIDE) && (mf->flag & ME_FACE_SEL))) {
 			nverts= (mf->v4)? 4: 3;
 
 			for(i=0; i<nverts; i++) {