[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32096] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for [#23970] Memory problem when setting hair amount to zero

Janne Karhu jhkarh at gmail.com
Fri Sep 24 09:39:52 CEST 2010


Revision: 32096
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32096
Author:   jhk
Date:     2010-09-24 09:39:52 +0200 (Fri, 24 Sep 2010)

Log Message:
-----------
Fix for [#23970] Memory problem when setting hair amount to zero

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

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2010-09-24 07:05:43 UTC (rev 32095)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2010-09-24 07:39:52 UTC (rev 32096)
@@ -195,9 +195,11 @@
 			psys->free_edit = NULL;
 		}
 
-		newpars= MEM_callocN(totpart*sizeof(ParticleData), "particles");
-		if(psys->part->phystype == PART_PHYS_BOIDS)
-			newboids= MEM_callocN(totpart*sizeof(BoidParticle), "boid particles");
+		if(totpart) {
+			newpars= MEM_callocN(totpart*sizeof(ParticleData), "particles");
+			if(psys->part->phystype == PART_PHYS_BOIDS)
+				newboids= MEM_callocN(totpart*sizeof(BoidParticle), "boid particles");
+		}
 	
 		if(psys->particles) {
 			totsaved=MIN2(psys->totpart,totpart);





More information about the Bf-blender-cvs mailing list