[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14479] trunk/blender/source/blender/src/ editmesh.c: fix for own error - [#9481] Active faces won't go away.

[Campbell Barton]

Revision: 14479
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14479
Author:   campbellbarton
Date:     2008-04-19 21:19:39 +0200 (Sat, 19 Apr 2008)

Log Message:
-----------
fix for own error - [#9481] Active faces won't go away.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editmesh.c

Modified: trunk/blender/source/blender/src/editmesh.c
===================================================================
--- trunk/blender/source/blender/src/editmesh.c	2008-04-19 17:55:35 UTC (rev 14478)
+++ trunk/blender/source/blender/src/editmesh.c	2008-04-19 19:19:39 UTC (rev 14479)
@@ -1010,20 +1010,20 @@
 				/* select and hide face flag */
 				if(mface->flag & ME_HIDE) {
 					efa->h= 1;
-				/* dont allow hidden and selected */
-				} else if(mface->flag & ME_FACE_SEL) {
-					efa->f |= SELECT;
-					
-					/* only allow selected face to be active */
+				} else {
 					if (a==me->act_face) {
 						EM_set_actFace(efa);
 					}
 					
-					if(FACESEL_PAINT_TEST) {
-						EM_select_face(efa, 1); /* flush down */
+					/* dont allow hidden and selected */
+					if(mface->flag & ME_FACE_SEL) {
+						efa->f |= SELECT;
+						
+						if(FACESEL_PAINT_TEST) {
+							EM_select_face(efa, 1); /* flush down */
+						}
 					}
 				}
-				
 			}
 		}
 	}