diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-12 04:20:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-12 04:20:35 +0400 |
| commit | 88c3781b7ce40fb6b839db91fd87cc93d5fd0012 (patch) | |
| tree | bf77f357eaca0dc971da96138af4bb1c0862edc0 /source | |
| parent | 9f5de68e5333f80ac173550ef337715eb04c897b (diff) | |
missing free call in rotsys_make_consistent
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/bmesh/operators/createops.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/mesh/bmesh_select.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/operators/createops.c b/source/blender/bmesh/operators/createops.c index 78286b045d4..e656e005858 100644 --- a/source/blender/bmesh/operators/createops.c +++ b/source/blender/bmesh/operators/createops.c @@ -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) diff --git a/source/blender/editors/mesh/bmesh_select.c b/source/blender/editors/mesh/bmesh_select.c index c9126bd4f51..175b63514b4 100644 --- a/source/blender/editors/mesh/bmesh_select.c +++ b/source/blender/editors/mesh/bmesh_select.c @@ -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) |