Merge with trunk: svn merge -r 12151:12179 https://svn.blender.org/svnroot/bf-blender...
[blender.git] / source / blender / src / editmesh.c
index 2f3127ba29b65a9a72e4d8228745602c88d2ace4..e8514cee2df9abcbc70dadb7f67101abb777e184 100644 (file)
@@ -1096,6 +1096,7 @@ void load_editMesh(void)
        a = 0;
        efa= em->faces.first;
        i = 0;
+       me->act_face = -1;
        while(efa) {
                mface= &((MFace *) me->mface)[i];
                
@@ -1151,8 +1152,8 @@ void load_editMesh(void)
                /* no index '0' at location 3 or 4 */
                test_index_face(mface, &me->fdata, i, efa->v4?4:3);
                
-               if (a==me->act_face)
-                       EM_set_actFace(efa);
+               if (EM_get_actFace() == efa)
+                       me->act_face = a;
 
 #ifdef WITH_VERSE
                if(efa->vface) {