Fix uninitialized variable in CustomData_bmesh_merge.
authorNicholas Bishop <nicholasbishop@gmail.com>
Thu, 29 Mar 2012 10:49:17 +0000 (10:49 +0000)
committerNicholas Bishop <nicholasbishop@gmail.com>
Thu, 29 Mar 2012 10:49:17 +0000 (10:49 +0000)
Caused a crash in array modifier with caps.

source/blender/blenkernel/intern/customdata.c

index 301ba282cbd907b2eec7580461737cd413a88ea5..17a29d89d199c0f4f3be54753256619fe62750c3 100644 (file)
@@ -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;