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/intern/bmesh_mesh.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/intern/bmesh_mesh.c')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index f3da337f653..6502346d88a 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -168,9 +168,8 @@ void BM_mesh_data_free(BMesh *bm) BMIter iter; BMIter itersub; - bool is_ldata_free; - bool is_pdata_free; - + const bool is_ldata_free = CustomData_bmesh_has_free(&bm->ldata); + const bool is_pdata_free = CustomData_bmesh_has_free(&bm->pdata); /* Check if we have to call free, if not we can avoid a lot of looping */ if (CustomData_bmesh_has_free(&(bm->vdata))) { @@ -184,9 +183,7 @@ void BM_mesh_data_free(BMesh *bm) } } - if ((is_ldata_free = CustomData_bmesh_has_free(&(bm->ldata))) || - (is_pdata_free = CustomData_bmesh_has_free(&(bm->pdata)))) - { + if (is_ldata_free || is_pdata_free) { BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) { if (is_pdata_free) CustomData_bmesh_free_block(&(bm->pdata), &(f->head.data)); |