archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix: active face was lost switching between faceselect mode and editmode.

Browse Source
This commit is contained in:
Brecht Van Lommel
2006-12-22 07:45:01 +00:00
parent 73382364a3
commit d892aac06b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/customdata.c
View File

@@ -211,10 +211,8 @@ static void layerCopy_tface(const void *source, void *dest, int count)
MTFace *dest_tf = (MTFace*)dest; MTFace *dest_tf = (MTFace*)dest;
int i; int i;
for(i = 0; i < count; ++i) { for(i = 0; i < count; ++i)
dest_tf[i] = source_tf[i]; dest_tf[i] = source_tf[i];
dest_tf[i].flag &= ~TF_ACTIVE;
}
} }
static void layerInterp_tface(void **sources, float *weights, static void layerInterp_tface(void **sources, float *weights,

7
source/blender/src/editface.c
View File

@@ -1459,7 +1459,7 @@ void select_tface_from_mface(Mesh *me)
{ {
MFace *mf; MFace *mf;
MTFace *tf; MTFace *tf;
int a; int a, hasactive=0;
if(!me->mtface) return; if(!me->mtface) return;
@@ -1471,6 +1471,11 @@ void select_tface_from_mface(Mesh *me)
if(mf->flag & ME_HIDE) tf->flag |= TF_HIDE; if(mf->flag & ME_HIDE) tf->flag |= TF_HIDE;
else tf->flag &= ~TF_HIDE; else tf->flag &= ~TF_HIDE;
if(tf->flag & TF_ACTIVE) {
if(hasactive) tf->flag &= ~TF_ACTIVE;
else hasactive= 1;
}
} }
} }