[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45481] trunk/blender/source/blender/ blenkernel/intern/customdata.c: Fix for last commit, forgot to free dup memory.

[Nicholas Bishop]

Revision: 45481
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45481
Author:   nicholasbishop
Date:     2012-04-09 02:20:26 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
Fix for last commit, forgot to free dup memory.

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-04-09 02:14:55 UTC (rev 45480)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c	2012-04-09 02:20:26 UTC (rev 45481)
@@ -2167,7 +2167,7 @@
 	/* copy old layer description so that old data can be copied into
 	   the new allocation */
 	destold = *dest;
-	destold.layers = MEM_dupallocN(destold.layers);
+	if (destold.layers) destold.layers = MEM_dupallocN(destold.layers);
 	
 	CustomData_merge(source, dest, mask, alloctype, 0);
 	dest->pool = NULL;
@@ -2213,6 +2213,7 @@
 	}
 
 	if (destold.pool) BLI_mempool_destroy(destold.pool);
+	if (destold.layers) MEM_freeN(destold.layers);
 }
 
 void CustomData_bmesh_free_block(CustomData *data, void **block)