[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15957] branches/soc-2008-nicholasbishop/ source/blender/src/sculptmode.c: Fixed a crash in sculptmode after applying a mulitres modifier.

[Nicholas Bishop]

Revision: 15957
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15957
Author:   nicholasbishop
Date:     2008-08-04 23:45:34 +0200 (Mon, 04 Aug 2008)

Log Message:
-----------
Fixed a crash in sculptmode after applying a mulitres modifier.

Modified Paths:
--------------
    branches/soc-2008-nicholasbishop/source/blender/src/sculptmode.c

Modified: branches/soc-2008-nicholasbishop/source/blender/src/sculptmode.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/sculptmode.c    
2008-08-04 20:53:52 UTC (rev 15956)
+++ branches/soc-2008-nicholasbishop/source/blender/src/sculptmode.c    
2008-08-04 21:45:34 UTC (rev 15957)
@@ -1462,14 +1462,13 @@
 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 @@
        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;
        }
        


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs