[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36626] branches/bmesh/blender/source/ blender: missing free call in rotsys_make_consistent

[Campbell Barton]

Revision: 36626
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36626
Author:   campbellbarton
Date:     2011-05-12 00:20:35 +0000 (Thu, 12 May 2011)
Log Message:
-----------
missing free call in rotsys_make_consistent

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

Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c   
2011-05-11 20:40:03 UTC (rev 36625)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c   
2011-05-12 00:20:35 UTC (rev 36626)
@@ -325,7 +325,8 @@
                        } while (e != vd->e);
                }
        }
-       
+
+       BLI_array_free(stack);
 }
 
 static void init_rotsys(BMesh *bm, EdgeData *edata, VertData *vdata)

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c   
2011-05-11 20:40:03 UTC (rev 36625)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c   
2011-05-12 00:20:35 UTC (rev 36626)
@@ -123,8 +123,7 @@
        BMEditMesh *em;
        
        if ((scene->toolsettings->automerge) &&
-           (obedit && obedit->type==OB_MESH) &&
-           (((Mesh*)obedit->data)->mr==NULL))
+           (obedit && obedit->type==OB_MESH))
        {
                em = ((Mesh*)obedit->data)->edit_btmesh;
                if (!em)

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