Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2008-08-05 01:45:34 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2008-08-05 01:45:34 +0400
commitc02f490d3ee480e40dded459d0a985aff54850b2 (patch)
tree1ad26c147ed1df66cec6e606416b88bdfa8884dd /source/blender
parent62e53c73b49cf53e30f153eef01bd1d3a8a9eacc (diff)
Fixed a crash in sculptmode after applying a mulitres modifier.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/src/sculptmode.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c
index d899ecbdd24..cd44163b31b 100644
--- a/source/blender/src/sculptmode.c
+++ b/source/blender/src/sculptmode.c
@@ -1462,14 +1462,13 @@ void sculptmode_selectbrush_menu(void)
void sculptmode_update_all_projverts(float *vertcosnos)
{
SculptSession *ss = sculpt_session();
- Mesh *me= get_mesh(OBACT);
unsigned i;
if(!ss->projverts)
- ss->projverts = MEM_mallocN(sizeof(ProjVert)*me->totvert,"ProjVerts");
+ ss->projverts = MEM_mallocN(sizeof(ProjVert)*ss->totvert,"ProjVerts");
- for(i=0; i<me->totvert; ++i) {
- project(vertcosnos ? &vertcosnos[i * 6] : me->mvert[i].co, ss->projverts[i].co);
+ for(i=0; i<ss->totvert; ++i) {
+ project(vertcosnos ? &vertcosnos[i * 6] : ss->mvert[i].co, ss->projverts[i].co);
ss->projverts[i].inside= 0;
}
}
@@ -1569,7 +1568,7 @@ char sculpt_modifiers_active(Object *ob)
ModifierData *md;
for(md= modifiers_getVirtualModifierList(ob); md; md= md->next) {
- if(md->mode & eModifierMode_Realtime)
+ if(md->mode & eModifierMode_Realtime && md->type != eModifierType_Multires)
return 1;
}