[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34529] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Silly mistake in own previous commit, now we have particles again!

[Janne Karhu]

Revision: 34529
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34529
Author:   jhk
Date:     2011-01-27 17:29:22 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
Silly mistake in own previous commit, now we have particles again!

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    
2011-01-27 14:40:44 UTC (rev 34528)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c    
2011-01-27 17:29:22 UTC (rev 34529)
@@ -221,16 +221,18 @@
 
                if(totpart) {
                        newpars= MEM_callocN(totpart*sizeof(ParticleData), 
"particles");
-                       if(psys->part->phystype == PART_PHYS_BOIDS)
+                       if(newpars == NULL)
+                               return;
+
+                       if(psys->part->phystype == PART_PHYS_BOIDS) {
                                newboids= 
MEM_callocN(totpart*sizeof(BoidParticle), "boid particles");
 
-                       if(ELEM(NULL, newpars, newboids)) {
-                                /* allocation error! */
-                               if(newpars)
-                                       MEM_freeN(newpars);
-                               if(newboids)
-                                       MEM_freeN(newboids);
-                               return;
+                               if(newboids == NULL) {
+                                        /* allocation error! */
+                                       if(newpars)
+                                               MEM_freeN(newpars);
+                                       return;
+                               }
                        }
                }
        

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs