[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42258] trunk/blender/source/blender/ editors/object/object_bake.c: Fix for memory leak in multires baker.

Sergey Sharybin sergey.vfx at gmail.com
Tue Nov 29 16:45:17 CET 2011


Revision: 42258
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42258
Author:   nazgul
Date:     2011-11-29 15:45:16 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Fix for memory leak in multires baker.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_bake.c

Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c	2011-11-29 15:26:46 UTC (rev 42257)
+++ trunk/blender/source/blender/editors/object/object_bake.c	2011-11-29 15:45:16 UTC (rev 42258)
@@ -636,6 +636,13 @@
 	return (void*)normal_data;
 }
 
+static void free_normal_data(void *bake_data)
+{
+	MNormalBakeData *normal_data= (MNormalBakeData*)bake_data;
+
+	MEM_freeN(normal_data);
+}
+
 static void apply_heights_data(void *bake_data)
 {
 	MHeightBakeData *height_data= (MHeightBakeData*)bake_data;
@@ -849,7 +856,7 @@
 
 			switch(bkr->mode) {
 				case RE_BAKE_NORMALS:
-					do_multires_bake(bkr, ima, apply_tangmat_callback, init_normal_data, NULL, NULL);
+					do_multires_bake(bkr, ima, apply_tangmat_callback, init_normal_data, NULL, free_normal_data);
 					break;
 				case RE_BAKE_DISPLACEMENT:
 					do_multires_bake(bkr, ima, apply_heights_callback, init_heights_data,




More information about the Bf-blender-cvs mailing list