diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-13 21:15:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-13 21:15:12 +0400 |
| commit | 12b3d458f28c2d9d7af25650f04d2a379bbbf604 (patch) | |
| tree | efb42f99d4c961d072f20593e24f9f4855f33e32 /source | |
| parent | 52f1ed4db883f4160d7f67e038e28b48d17995d4 (diff) | |
Bugfixes for particle mode:
* Fix crash removing all particles.
* Brush added particles did not get correct coordinates.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index d4a180e2427..74ed6451d29 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3003,6 +3003,9 @@ static void brush_add(PEData *data, short number) for(k=0, hkey=pa->hair; k<pa->totkey; k++, hkey++, key++) { key->co= hkey->co; key->time= &hkey->time; + + if(!(psys->flag & PSYS_GLOBAL_HAIR)) + key->flag |= PEK_USE_WCO; } pa->size= 1.0f; diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 096129f6f9e..78dd53e7271 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -4237,7 +4237,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj if(!(point->flag & PEP_HIDE)) totkeys += point->totkey; - if(!(edit->points->keys->flag & PEK_USE_WCO)) + if(edit->points && !(edit->points->keys->flag & PEK_USE_WCO)) pd=pdata=MEM_callocN(totkeys*3*sizeof(float), "particle edit point data"); cd=cdata=MEM_callocN(totkeys*(timed?4:3)*sizeof(float), "particle edit color data"); |