[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42511] branches/bmesh/blender/source/ blender/editors/mesh: Fix #29539 Crash on shortest path

[Howard Trickey]

Revision: 42511
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42511
Author:   howardt
Date:     2011-12-08 12:53:43 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
Fix #29539 Crash on shortest path

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
    branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c   
2011-12-08 11:37:04 UTC (rev 42510)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c   
2011-12-08 12:53:43 UTC (rev 42511)
@@ -1218,6 +1218,7 @@
        em->bm->elem_index_dirty &= ~BM_EDGE;
 
        /* alloc */
+       totvert = em->bm->totvert;
        nedges = MEM_callocN(sizeof(*nedges)*totvert+1, "SeamPathNEdges");
        edges = MEM_mallocN(sizeof(*edges)*totedge*2, "SeamPathEdges");
        prevedge = MEM_mallocN(sizeof(*prevedge)*totedge, "SeamPathPrevious");

Modified: branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c      
2011-12-08 11:37:04 UTC (rev 42510)
+++ branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c      
2011-12-08 12:53:43 UTC (rev 42511)
@@ -752,7 +752,7 @@
        int *polyindex = NULL;
        float (*face_nors)[3];
 
-       if(mesh->totface > 0 && mesh->totpoly == 0)
+       /* if(mesh->totface > 0 && mesh->totpoly == 0) */
                convert_mfaces_to_mpolys(mesh);
 
        if(calc_edges || (mesh->totpoly && mesh->totedge == 0))

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