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

Fixed bug #5390, smooth brush ignores verts on outer edge

Browse Source 
The fix is to allow smoothing for edge verts, but only use other edge verts in
the calculation.
This commit is contained in:
Nicholas Bishop 2006-12-10 05:05:48 +00:00
parent ab150e8512
commit c66b56b6e0
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/src/sculptmode.c
View File

@ -718,14 +718,23 @@ void do_draw_brush(EditData *e, const ListBase* active_verts)
vec3f neighbor_average(const int vert)
{
Mesh *me= get_mesh(G.scene->sculptdata.active_ob);
SculptData *sd= &G.scene->sculptdata;
Mesh *me= get_mesh(sd->active_ob);
int i, skip= -1, total=0;
IndexNode *node= G.scene->sculptdata.vertex_users[vert].first;
IndexNode *node= sd->vertex_users[vert].first;
vec3f avg= {0,0,0};
char ncount= BLI_countlist(&sd->vertex_users[vert]);
MFace *f;
/* Don't modify corner vertices */
if(ncount==1) {
VecCopyf(&avg.x, me->mvert[vert].co);
return avg;
}
while(node){
f= &me->mface[node->Index];
if(f->v4) {
skip= (f->v1==vert?2:
f->v2==vert?3:
@ -734,7 +743,7 @@ vec3f neighbor_average(const int vert)
}
for(i=0; i<(f->v4?4:3); ++i) {
if(i != skip) {
if(i != skip && (ncount!=2 || BLI_countlist(&sd->vertex_users[(&f->v1)[i]]) <= 2)) {
VecAddf(&avg.x,&avg.x,me->mvert[(&f->v1)[i]].co);
++total;
}
@ -743,9 +752,13 @@ vec3f neighbor_average(const int vert)
node= node->next;
}
if(total>0) {
avg.x/= total;
avg.y/= total;
avg.z/= total;
}
else
VecCopyf(&avg.x, me->mvert[vert].co);
return avg;
}
@ -760,15 +773,11 @@ void do_smooth_brush(const ListBase* active_verts)
while(node){
cur= node->Index;
if(BLI_countlist(&G.scene->sculptdata.vertex_users[cur]) > 2) {
avg.x=avg.y=avg.z= 0;
avg= neighbor_average(cur);
me->mvert[cur].co[0]+= (avg.x - me->mvert[cur].co[0])*node->Fade;
me->mvert[cur].co[1]+= (avg.y - me->mvert[cur].co[1])*node->Fade;
me->mvert[cur].co[2]+= (avg.z - me->mvert[cur].co[2])*node->Fade;
}
node= node->next;
}