sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

bugfix #3100

Browse Source 
Hrms... previous commit here to make sure faces are not added 'double',
caused a part in removedoubles not to work well, removing too many
faces. Solved it more proper now.
This commit is contained in:
Ton Roosendaal 2005-09-24 15:36:25 +00:00
parent 94aa843626
commit e5b9f62c6e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/include/editmesh.h
View File

@ -70,7 +70,7 @@ extern int faceselectedAND(EditFace *efa, int flag);
extern EditFace *exist_face(EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4); extern EditFace *exist_face(EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4);
extern void flipface(EditFace *efa); // flips for normal direction extern void flipface(EditFace *efa); // flips for normal direction
extern int compareface(EditFace *vl1, EditFace *vl2); extern int compareface(EditFace *vl1, EditFace *vl2, int test);
/* flag for selection bits, *nor will be filled with normal for extrusion constraint */ /* flag for selection bits, *nor will be filled with normal for extrusion constraint */
/* return value defines if such normal was set */ /* return value defines if such normal was set */

4
source/blender/src/butspace.c
View File

@ -425,9 +425,9 @@ void drawbutspace(ScrArea *sa, void *spacedata)
case CONTEXT_OBJECT: case CONTEXT_OBJECT:
tab= sbuts->tab[CONTEXT_OBJECT]; tab= sbuts->tab[CONTEXT_OBJECT];
if(tab==sbuts->tab[TAB_OBJECT_OBJECT]) if(tab==TAB_OBJECT_OBJECT)
object_panels(); object_panels();
else if(tab==sbuts->tab[TAB_OBJECT_PHYSICS]) else if(tab==TAB_OBJECT_PHYSICS)
physics_panels(); physics_panels();
break; break;

10
source/blender/src/editmesh_lib.c
View File

@ -1373,8 +1373,8 @@ void recalc_editnormals(void)
} }
/* this also prevents triangles being made in quads */ /* this also allows to prevent triangles being made in quads */
int compareface(EditFace *vl1, EditFace *vl2) int compareface(EditFace *vl1, EditFace *vl2, int test)
{ {
EditVert *v1, *v2, *v3, *v4; EditVert *v1, *v2, *v3, *v4;
int equal= 0; int equal= 0;
@ -1389,9 +1389,9 @@ int compareface(EditFace *vl1, EditFace *vl2)
if(vl1->v1==v3 || vl1->v2==v3 || vl1->v3==v3 || vl1->v4==v3) equal++; if(vl1->v1==v3 || vl1->v2==v3 || vl1->v3==v3 || vl1->v4==v3) equal++;
if(vl1->v1==v4 || vl1->v2==v4 || vl1->v3==v4 || vl1->v4==v4) equal++; if(vl1->v1==v4 || vl1->v2==v4 || vl1->v3==v4 || vl1->v4==v4) equal++;
if(equal>2) return 1; if(equal<test) return 0;
return 0; return 1;
} }
/* this also prevents triangles being made in quads */ /* this also prevents triangles being made in quads */
@ -1407,7 +1407,7 @@ EditFace *exist_face(EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4)
efa= em->faces.first; efa= em->faces.first;
while(efa) { while(efa) {
if(compareface(&efatest, efa)) return efa; if(compareface(&efatest, efa, 3)) return efa;
efa= efa->next; efa= efa->next;
} }
return NULL; return NULL;

2
source/blender/src/editmesh_tools.c
View File

@ -414,7 +414,7 @@ int removedoublesflag(short flag, float limit) /* return amount */
/* second test: is test permitted? */ /* second test: is test permitted? */
efa= vsb1->efa; efa= vsb1->efa;
if( (efa->f1 & 128)==0 ) { if( (efa->f1 & 128)==0 ) {
if( compareface(efa, vsb->efa)) efa->f1 |= 128; if( compareface(efa, vsb->efa, 4)) efa->f1 |= 128;
} }
vsb1++; vsb1++;