griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

== Sculpt Mode ==

Browse Source 
Fixed bug #6631, Sculpt Tool don't works correctly on a mesh with Armature modifier

* Modified the calculation of projected (2D) vertex locations to use deformed vertex locations when appropriate
This commit is contained in:
Nicholas Bishop
2007-05-03 19:39:23 +00:00
parent 674f23c536
commit 4ec6f1b4e4
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1497,7 +1497,7 @@ void sculptmode_selectbrush_menu(void)
}
}
void sculptmode_update_all_projverts()
void sculptmode_update_all_projverts(float *vertcosnos)
{
Mesh *me= get_mesh(OBACT);
unsigned i;
@@ -1505,7 +1505,7 @@ void sculptmode_update_all_projverts()
if(projverts) MEM_freeN(projverts);
projverts= MEM_mallocN(sizeof(ProjVert)*me->totvert,"ProjVerts");
for(i=0; i<me->totvert; ++i) {
project(me->mvert[i].co, projverts[i].co);
project(vertcosnos ? &vertcosnos[i * 6] : me->mvert[i].co, projverts[i].co);
projverts[i].inside= 0;
}
}
@@ -1676,7 +1676,9 @@ void sculpt(void)
init_sculptmatrices();
sculptmode_update_all_projverts();
if(modifier_calculations)
vertexcosnos= mesh_get_mapped_verts_nors(ob);
sculptmode_update_all_projverts(vertexcosnos);
e.grabdata= NULL;
e.layer_disps= NULL;
@@ -1699,7 +1701,7 @@ void sculpt(void)
spacing+= sqrt(pow(mvalo[0]-mouse[0],2)+pow(mvalo[1]-mouse[1],2));
if(modifier_calculations)
if(modifier_calculations && !vertexcosnos)
vertexcosnos= mesh_get_mapped_verts_nors(ob);
if(G.scene->sculptdata.brush_type != GRAB_BRUSH && (sd->spacing==0 || spacing>sd->spacing)) {
@@ -1792,8 +1794,11 @@ void sculpt(void)
mvalo[0]= mouse[0];
mvalo[1]= mouse[1];
if(modifier_calculations)
if(vertexcosnos) {
MEM_freeN(vertexcosnos);
vertexcosnos= NULL;
}
}
else BIF_wait_for_statechange();
}