[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34138] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: bugfix [#25519] particlesystem, type hair, hair dynamics enabled: crash with amount 0

[Campbell Barton]

Revision: 34138
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34138
Author:   campbellbarton
Date:     2011-01-07 04:30:02 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
bugfix [#25519] particlesystem, type hair, hair dynamics enabled: crash with amount 0

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-07 04:10:37 UTC (rev 34137)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-01-07 04:30:02 UTC (rev 34138)
@@ -3297,8 +3297,8 @@
 			cloth_free_modifier(psys->clmd);
 	}
 
-	/* dynamics with cloth simulation */
-	if(psys->part->type==PART_HAIR && psys->flag & PSYS_HAIR_DYNAMICS)
+	/* dynamics with cloth simulation, psys->particles can be NULL with 0 particles [#25519] */
+	if(psys->part->type==PART_HAIR && psys->flag & PSYS_HAIR_DYNAMICS && psys->particles)
 		do_hair_dynamics(sim);
 
 	/* following lines were removed r29079 but cause bug [#22811], see report for details */