- added code to draw loose edges in textured and fastshade views

2 files changed, 16 insertions, 1 deletions

diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c
index 854b3ffb9fe..f22379fcabe 100644
--- a/source/blender/src/drawmesh.c
+++ b/source/blender/src/drawmesh.c
@@ -924,6 +924,14 @@ void draw_tface_mesh(Object *ob, Mesh *me, int dt)
 	
 	glFrontFace(GL_CCW);
 
+	if(dt > OB_SOLID && !(ob==OBACT && (G.f & G_FACESELECT) && me && me->tface)) {
+		if(ob->flag & SELECT) {
+			BIF_ThemeColor((ob==OBACT)?TH_ACTIVE:TH_SELECT);
+		} else {
+			BIF_ThemeColor(TH_WIRE);
+		}
+		dm->drawEdgesFlag(dm, ME_LOOSEEDGE, ME_LOOSEEDGE);
+	}
 }
 
 void init_realtime_GL(void)
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index e2c9a8fff7f..2609202b5a7 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -1767,6 +1767,13 @@ static void draw_mesh_fancy(Object *ob, DerivedMesh *baseDM, DerivedMesh *dm, in
 			}
 
 			dm->drawFacesColored(dm, me->flag&ME_TWOSIDED, (unsigned char*) obCol1, (unsigned char*) obCol2);
+
+			if(ob->flag & SELECT) {
+				BIF_ThemeColor((ob==OBACT)?TH_ACTIVE:TH_SELECT);
+			} else {
+				BIF_ThemeColor(TH_WIRE);
+			}
+			dm->drawEdgesFlag(dm, ME_LOOSEEDGE, ME_LOOSEEDGE);
 		}
 	}
 
@@ -3878,7 +3885,7 @@ static void bbs_mesh_solid(Object *ob)
 	int a, glmode, dmNeedsFree;
 	DerivedMesh *dm = mesh_get_derived_deform(ob, &dmNeedsFree);
 	
-	cpack(0);
+	glColor3ub(0, 0, 0);
 
 	glBegin(glmode=GL_QUADS);
 	for(a=0; a<me->totface; a++, mface++, tface++) {