[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16464] trunk/blender/source/blender/ blenkernel/intern/subsurf_ccg.c: Bugfix [#17594] separated mesh crash

[Daniel Genrich]

Revision: 16464
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16464
Author:   genscher
Date:     2008-09-10 17:51:10 +0200 (Wed, 10 Sep 2008)

Log Message:
-----------
Bugfix [#17594] separated mesh crash

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c        
2008-09-10 15:25:06 UTC (rev 16463)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c        
2008-09-10 15:51:10 UTC (rev 16464)
@@ -980,7 +980,7 @@
 
        memset(mv, 0, sizeof(*mv));
 
-       if(vertNum < ccgdm->edgeMap[0].startVert) {
+       if((vertNum < ccgdm->edgeMap[0].startVert) && 
(ccgSubSurf_getNumFaces(ss) > 0)) {
                /* this vert comes from face data */
                int lastface = ccgSubSurf_getNumFaces(ss) - 1;
                CCGFace *f;
@@ -1021,7 +1021,7 @@
                        x = offset % gridSideVerts + 1;
                        VecCopyf(mv->co, ccgSubSurf_getFaceGridData(ss, f, 
grid, x, y));
                }
-       } else if(vertNum < ccgdm->vertMap[0].startVert) {
+       } else if((vertNum < ccgdm->vertMap[0].startVert) && 
(ccgSubSurf_getNumEdges(ss) > 0)) {
                /* this vert comes from edge data */
                CCGEdge *e;
                int lastedge = ccgSubSurf_getNumEdges(ss) - 1;


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