[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25562] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for [#20294] Switching to particle mode after changing number of hair particles causes blender to crash .
Janne Karhu
jhkarh at utu.fi
Sat Dec 26 01:17:54 CET 2009
Revision: 25562
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25562
Author: jhk
Date: 2009-12-26 01:17:54 +0100 (Sat, 26 Dec 2009)
Log Message:
-----------
Fix for [#20294] Switching to particle mode after changing number of hair particles causes blender to crash.
* Particle edit mode wasn't freed when the particle amount was changed.
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 2009-12-26 00:17:45 UTC (rev 25561)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2009-12-26 00:17:54 UTC (rev 25562)
@@ -170,6 +170,12 @@
PARTICLE_P;
int totpart, totsaved = 0;
+ if(psys->edit && psys->free_edit) {
+ psys->free_edit(psys->edit);
+ psys->edit = NULL;
+ psys->free_edit = NULL;
+ }
+
if(new_totpart<0) {
if(part->distr==PART_DISTR_GRID && part->from != PART_FROM_VERT) {
totpart= part->grid_res;
More information about the Bf-blender-cvs
mailing list