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

=bmesh= fixed a tesselation bug, and smooth shaded operator in object mode

Browse Source
This commit is contained in:
Joseph Eagar
2011-04-24 08:06:26 +00:00
parent 342ebe938f
commit 84afe5f3c9
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/mesh.c
View File

@@ -1662,6 +1662,12 @@ void mesh_delete_material_index(Mesh *me, int index)
{
int i;
for (i=0; i<me->totpoly; i++) {
MPoly *mf = &((MFace*) me->mpoly)[i];
if (mf->mat_nr && mf->mat_nr>=index)
mf->mat_nr--;
}
for (i=0; i<me->totface; i++) {
MFace *mf = &((MFace*) me->mface)[i];
if (mf->mat_nr && mf->mat_nr>=index)
@@ -1674,6 +1680,16 @@ void mesh_set_smooth_flag(Object *meshOb, int enableSmooth)
Mesh *me = meshOb->data;
int i;
for (i=0; i<me->totpoly; i++) {
MPoly *mp = &((MPoly*) me->mpoly)[i];
if (enableSmooth) {
mp->flag |= ME_SMOOTH;
} else {
mp->flag &= ~ME_SMOOTH;
}
}
for (i=0; i<me->totface; i++) {
MFace *mf = &((MFace*) me->mface)[i];

5
source/blender/blenlib/intern/scanfill.c
View File

@@ -789,7 +789,7 @@ int BLI_edgefill(int mat_nr)
EditVert *eve;
EditEdge *eed,*nexted;
PolyFill *pflist,*pf;
float *minp, *maxp, *v1, *v2, norm[3], len;
float limit, *minp, *maxp, *v1, *v2, norm[3], len;
short a,c,poly=0,ok=0,toggle=0;
/* reset variables */
@@ -864,12 +864,13 @@ int BLI_edgefill(int mat_nr)
v1= eve->co;
v2= 0;
eve= fillvertbase.first;
limit = a < 5 ? FLT_EPSILON*200 : M_PI/24.0;
while(eve) {
if(v2) {
if( compare_v3v3(v2, eve->co, COMPLIMIT)==0) {
float inner = angle_v3v3v3(v1, v2, eve->co);
if (fabs(inner-M_PI) < FLT_EPSILON*200 || fabs(inner) < FLT_EPSILON*200) {
if (fabs(inner-M_PI) < limit || fabs(inner) < limit) {
eve = eve->next;
continue;
}