[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57049] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: modification to r57023, use active color but only draw face-stipple when selected.

[Campbell Barton]

Revision: 57049
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57049
Author:   campbellbarton
Date:     2013-05-27 13:03:33 +0000 (Mon, 27 May 2013)
Log Message:
-----------
modification to r57023, use active color but only draw face-stipple when selected. (active-unselected isn't in common usage for mesh editmode).

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57023

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-05-27 12:42:48 UTC (rev 57048)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-05-27 13:03:33 UTC (rev 57049)
@@ -2369,10 +2369,7 @@
 	
 	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
 		if (efa == data->efa_act) {
-			if (BM_elem_flag_test(efa, BM_ELEM_SELECT))
-				glColor4ubv(data->cols[1]);
-			else
-				glColor4ubv(data->cols[2]);
+			glColor4ubv(data->cols[2]);
 			return DM_DRAW_OPTION_STIPPLE;
 		}
 		else {
@@ -2968,7 +2965,7 @@
 
 {
 	Mesh *me = ob->data;
-	BMFace *efa_act = BM_active_face_get(em->bm, false, false); /* annoying but active faces is stored differently */
+	BMFace *efa_act = BM_active_face_get(em->bm, false, true); /* annoying but active faces is stored differently */
 	BMEdge *eed_act = NULL;
 	BMVert *eve_act = NULL;