diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-29 14:49:17 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-29 14:49:17 +0400 |
| commit | 7661f429c6bc0b146187cb8a7522460577f334d8 (patch) | |
| tree | 2a2f3d16eb2102607396ff3955ad581a4c41ffbf /source/blender/blenkernel/intern/customdata.c | |
| parent | a173508f493e27c6b746b00435f631a31d8419d8 (diff) | |
Fix uninitialized variable in CustomData_bmesh_merge.
Caused a crash in array modifier with caps.
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.c')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 301ba282cbd..17a29d89d19 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2184,6 +2184,7 @@ void CustomData_bmesh_merge(CustomData *source, CustomData *dest, if (t != BM_LOOPS_OF_FACE) { /*ensure all current elements follow new customdata layout*/ BM_ITER(h, &iter, bm, t, NULL) { + tmp = NULL; CustomData_bmesh_copy_data(&destold, dest, h->data, &tmp); CustomData_bmesh_free_block(&destold, &h->data); h->data = tmp; |