diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-18 19:55:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-18 19:55:09 +0300 |
| commit | 84b58f8653218ff10f701cfef402c4f699a9b0d2 (patch) | |
| tree | 10d1f64b52541f280b3315552a3a67eabde2112e /source/blender/src/editparticle.c | |
| parent | f4e1c89b2020a73c330aebbdcfe619956608d3b1 (diff) | |
Particles
=========
- The render and realtime button for the particle system modifier
and the enabled button for particles now work seperate again,
made a bad design decision to tie them together. Now with only
the render button and not realtime enabled it renders.
- Fix for bug #7948: particle mode crash while constraining axis.
- Fix for bug #7945: crash loading effector groups from an old file.
- Fix for bug #7942: crash for reactor particles emitting from particles.
Diffstat (limited to 'source/blender/src/editparticle.c')
| -rw-r--r-- | source/blender/src/editparticle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/editparticle.c b/source/blender/src/editparticle.c index cad5e4af5b5..0475e91f2b7 100644 --- a/source/blender/src/editparticle.c +++ b/source/blender/src/editparticle.c @@ -157,7 +157,7 @@ void PE_change_act(void *ob_v, void *act_v) if((psys=BLI_findlink(&ob->particlesystem,act))) { psys->flag |= PSYS_CURRENT; - if(psys->flag & PSYS_ENABLED) { + if(psys_check_enabled(ob, psys)) { if(G.f & G_PARTICLEEDIT && !psys->edit) PE_create_particle_edit(ob, psys); PE_recalc_world_cos(ob, psys); @@ -186,7 +186,7 @@ ParticleSystem *PE_get_current(Object *ob) psys->flag |= PSYS_CURRENT; } - if(psys && (psys->flag & PSYS_ENABLED) && ob == OBACT && (G.f & G_PARTICLEEDIT)) + if(psys && psys_check_enabled(ob, psys) && ob == OBACT && (G.f & G_PARTICLEEDIT)) if(psys->part->type == PART_HAIR && psys->flag & PSYS_EDITED) if(psys->edit == NULL) PE_create_particle_edit(ob, psys); @@ -1102,7 +1102,7 @@ void PE_set_particle_edit(void) if((G.f & G_PARTICLEEDIT)==0){ if(psys && psys->part->type == PART_HAIR && psys->flag & PSYS_EDITED) { - if(psys->flag & PSYS_ENABLED) { + if(psys_check_enabled(ob, psys)) { if(psys->edit==0) PE_create_particle_edit(ob, psys); PE_recalc_world_cos(ob, psys); |