[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12463] branches/particles/source/blender/ blenkernel/intern/particle_system.c: wasnt free'ing the right pointer

Campbell Barton cbarton at metavr.com
Sat Nov 3 21:15:36 CET 2007


Revision: 12463
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12463
Author:   campbellbarton
Date:     2007-11-03 21:15:36 +0100 (Sat, 03 Nov 2007)

Log Message:
-----------
wasnt free'ing the right pointer

Modified Paths:
--------------
    branches/particles/source/blender/blenkernel/intern/particle_system.c

Modified: branches/particles/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/particles/source/blender/blenkernel/intern/particle_system.c	2007-11-03 19:56:14 UTC (rev 12462)
+++ branches/particles/source/blender/blenkernel/intern/particle_system.c	2007-11-03 20:15:36 UTC (rev 12463)
@@ -172,10 +172,10 @@
 		int totface = me->totface;
 		int *origindex = DM_get_face_data_layer(dm, CD_ORIGINDEX);
 		int i;
-		LinkNode *node, **node_array;
+		LinkNode *node, *node_dm_faces, **node_array;
 		
-		node= MEM_callocN(sizeof(LinkNode)*tot_dm_face, "faceindicies");
-		node_array = MEM_callocN(sizeof(LinkNode *)*totface, "faceindicies");
+		node_dm_faces = node= MEM_callocN(sizeof(LinkNode)*tot_dm_face, "faceindicies");
+		node_array = MEM_callocN(sizeof(LinkNode *)*totface, "faceindicies array");
 		
 		for (i=0; i < tot_dm_face; i++, origindex++, node++) {
 			node->link = (void *)i; // or use the index?
@@ -201,8 +201,8 @@
 		//for (i=0; i < totface; i++) {
 		//	i = psys_particle_dm_face_lookup(dm, node_array[], fuv, (LinkNode*)NULL);
 		//}
-		MEM_freeN(node);
 		MEM_freeN(node_array);
+		MEM_freeN(node_dm_faces);
 		
 	} else {
 		/* set the num_dmcache to an invalid value, just incase */





More information about the Bf-blender-cvs mailing list