diff options
Diffstat (limited to 'source/blender/src/buttons_editing.c')
| -rw-r--r-- | source/blender/src/buttons_editing.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index b52b5ebc306..976d50cd9e1 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -4099,9 +4099,6 @@ void do_meshbuts(unsigned short event) if (G.obedit || me) { CustomData *fdata= (G.obedit)? &em->fdata: &me->fdata; - if (G.f & G_FACESELECT) - select_mface_from_tface(me); - CustomData_set_layer_active(fdata, CD_MTFACE, acttface-1); mesh_update_customdata_pointers(me); @@ -4109,9 +4106,6 @@ void do_meshbuts(unsigned short event) if(me && me->mr && me->mr->current != 1) CustomData_set_layer_active(&me->mr->fdata, CD_MTFACE, acttface-1); - if (G.f & G_FACESELECT) - select_tface_from_mface(me); - DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); BIF_undo_push("Set Active UV Texture"); allqueue(REDRAWVIEW3D, 0); @@ -4745,6 +4739,7 @@ void do_fpaintbuts(unsigned short event) Object *ob; bDeformGroup *defGroup; MTFace *activetf, *tf; + MFace *mf; MCol *activemcol; int a; SculptData *sd= &G.scene->sculptdata; @@ -4770,8 +4765,8 @@ void do_fpaintbuts(unsigned short event) activetf= get_active_tface(&activemcol); if(me && activetf) { - for (a=0, tf=me->mtface; a < me->totface; a++, tf++) { - if(tf!=activetf && (tf->flag & TF_SELECT)) { + for (a=0, tf=me->mtface, mf=me->mface; a < me->totface; a++, tf++, mf++) { + if(tf!=activetf && (mf->flag & ME_FACE_SEL)) { if(event==B_COPY_TF_MODE) { tf->mode= activetf->mode; tf->transp= activetf->transp; |