[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45257] trunk/blender/source/blender/ blenkernel/intern/customdata.c: Fix uninitialized variable in CustomData_bmesh_merge.

[Nicholas Bishop]

Revision: 45257
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45257
Author:   nicholasbishop
Date:     2012-03-29 10:49:17 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
Fix uninitialized variable in CustomData_bmesh_merge.

Caused a crash in array modifier with caps.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/customdata.c

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c	2012-03-29 03:06:42 UTC (rev 45256)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c	2012-03-29 10:49:17 UTC (rev 45257)
@@ -2184,6 +2184,7 @@
 	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;