- make sure object outline doesn't get drawn in faceselect mode
authorDaniel Dunbar <daniel@zuster.org>
Thu, 14 Apr 2005 13:46:49 +0000 (13:46 +0000)
committerDaniel Dunbar <daniel@zuster.org>
Thu, 14 Apr 2005 13:46:49 +0000 (13:46 +0000)
source/blender/src/drawobject.c

index 66fb6bf9ed2ef132381c22487f444ee3a2ad4775..e5c9adfe05b164ec7020b8b450d523aa6017d7b8 100644 (file)
@@ -1741,7 +1741,7 @@ static void draw_mesh_fancy(Object *ob, DerivedMesh *baseDM, DerivedMesh *realDM
                draw_wire = 1;
        }
        else if( (ob==OBACT && (G.f & G_FACESELECT)) || (G.vd->drawtype==OB_TEXTURE && dt>OB_SOLID)) {
-               if ((G.vd->flag&V3D_SELECT_OUTLINE) && (ob->flag&SELECT) && !draw_wire) {
+               if ((G.vd->flag&V3D_SELECT_OUTLINE) && (ob->flag&SELECT) && !(G.f&G_FACESELECT) && !draw_wire) {
                        draw_mesh_object_outline(dm);
                }