missing free call in rotsys_make_consistent
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 May 2011 00:20:35 +0000 (00:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 May 2011 00:20:35 +0000 (00:20 +0000)
source/blender/bmesh/operators/createops.c
source/blender/editors/mesh/bmesh_select.c

index 78286b045d4ec15d1831386f9cd0309b58af2bdb..e656e005858c91e5c989f58f0372f2654a770b64 100644 (file)
@@ -325,7 +325,8 @@ static void rotsys_make_consistent(BMesh *bm, EdgeData *edata, VertData *vdata)
                        } while (e != vd->e);
                }
        }
-       
+
+       BLI_array_free(stack);
 }
 
 static void init_rotsys(BMesh *bm, EdgeData *edata, VertData *vdata)
index c9126bd4f515e385411cb57f4191b47cd9be71cb..175b63514b42a925e8efae6effdea4b686156f86 100644 (file)
@@ -123,8 +123,7 @@ void EDBM_automerge(Scene *scene, Object *obedit, int update)
        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)