diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-09 11:02:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-09 11:02:51 +0400 |
| commit | 6f8c29ab0b0b33bcb8fc75d47fc3f5eca8fc55cd (patch) | |
| tree | 05f75e99305421b82a209d8ff2f55bff50bacdc1 /source/blender/bmesh/operators/bmo_dissolve.c | |
| parent | 279a2a1916d87aea05a67a592c9831c8d335071b (diff) | |
fix for 2 errors introduced since release
- shape key NULL pointer dereference.
- use uninitialized variable for bmesh free.
also update credits and merge dissolve flag assignment.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_dissolve.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_dissolve.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index edac72423b4..ee483edbef5 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -403,8 +403,7 @@ void bmo_dissolve_verts_exec(BMesh *bm, BMOperator *op) } BM_ITER_ELEM (f, &fiter, v, BM_FACES_OF_VERT) { - BMO_elem_flag_enable(bm, f, FACE_ORIG); - BMO_elem_flag_enable(bm, f, FACE_MARK); + BMO_elem_flag_enable(bm, f, FACE_MARK | FACE_ORIG); } /* check if our additions to the input to face dissolve @@ -412,8 +411,7 @@ void bmo_dissolve_verts_exec(BMesh *bm, BMOperator *op) if (!test_extra_verts(bm, v)) { BM_ITER_ELEM (f, &fiter, v, BM_FACES_OF_VERT) { if (BMO_elem_flag_test(bm, f, FACE_ORIG)) { - BMO_elem_flag_disable(bm, f, FACE_MARK); - BMO_elem_flag_disable(bm, f, FACE_ORIG); + BMO_elem_flag_disable(bm, f, FACE_MARK | FACE_ORIG); } } } |