OLD | NEW |
1 /* | 1 /* |
2 * $Id$ | 2 * $Id$ |
3 * | 3 * |
4 * ***** BEGIN GPL LICENSE BLOCK ***** | 4 * ***** BEGIN GPL LICENSE BLOCK ***** |
5 * | 5 * |
6 * This program is free software; you can redistribute it and/or | 6 * This program is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU General Public License | 7 * modify it under the terms of the GNU General Public License |
8 * as published by the Free Software Foundation; either version 2 | 8 * as published by the Free Software Foundation; either version 2 |
9 * of the License, or (at your option) any later version. | 9 * of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
516 int a, totface= me->totface; | 516 int a, totface= me->totface; |
517 | 517 |
518 /* don't draw without tfaces */ | 518 /* don't draw without tfaces */ |
519 if(!tface) | 519 if(!tface) |
520 return; | 520 return; |
521 | 521 |
522 /* don't draw when editing */ | 522 /* don't draw when editing */ |
523 if(ob->mode & OB_MODE_EDIT) | 523 if(ob->mode & OB_MODE_EDIT) |
524 return; | 524 return; |
525 else if(ob==OBACT) | 525 else if(ob==OBACT) |
526 » » if(paint_facesel_test(ob)) | 526 » » if(paint_facesel_test(ob) || paint_vertsel_test(ob)) |
527 return; | 527 return; |
528 | 528 |
529 ddm = mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH); | 529 ddm = mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH); |
530 | 530 |
531 for(a=0, mf=mface; a<totface; a++, tface++, mf++) { | 531 for(a=0, mf=mface; a<totface; a++, tface++, mf++) { |
532 int mode= tface->mode; | 532 int mode= tface->mode; |
533 int matnr= mf->mat_nr; | 533 int matnr= mf->mat_nr; |
534 int mf_smooth= mf->flag & ME_SMOOTH; | 534 int mf_smooth= mf->flag & ME_SMOOTH; |
535 | 535 |
536 if (!(mf->flag&ME_HIDE) && !(mode&TF_INVISIBLE) && (mode&TF_BMFO
NT)) { | 536 if (!(mf->flag&ME_HIDE) && !(mode&TF_INVISIBLE) && (mode&TF_BMFO
NT)) { |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
633 if(!(ob == scene->obedit) && faceselect) | 633 if(!(ob == scene->obedit) && faceselect) |
634 draw_mesh_face_select(rv3d, me, dm); | 634 draw_mesh_face_select(rv3d, me, dm); |
635 | 635 |
636 /* reset from negative scale correction */ | 636 /* reset from negative scale correction */ |
637 glFrontFace(GL_CCW); | 637 glFrontFace(GL_CCW); |
638 ········ | 638 ········ |
639 /* in editmode, the blend mode needs to be set incase it was ADD */ | 639 /* in editmode, the blend mode needs to be set incase it was ADD */ |
640 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); | 640 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); |
641 } | 641 } |
642 | 642 |
OLD | NEW |