diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-11 18:03:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-11 18:03:45 +0300 |
| commit | 65758a9a20807b3ee6ae470f76b4fe3d0cb382f6 (patch) | |
| tree | 7022ec918c5b62a31fbbe88143525515395272b7 /source/blender/src/buttons_object.c | |
| parent | d5edeb526cd980b9bccce5d174593c5306dada63 (diff) | |
Bugfixes for:
- Disabled particle modifiers in particle mode.
- Particle col option without material.
Diffstat (limited to 'source/blender/src/buttons_object.c')
| -rw-r--r-- | source/blender/src/buttons_object.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index e0190ab474f..8d29e044142 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -2853,6 +2853,23 @@ void do_effects_panels(unsigned short event) allqueue(REDRAWOOPS, 0); } break; + case B_PART_ENABLE: + if(psys) { + ParticleSystemModifierData *psmd= psys_get_modifier(ob, psys); + if(psys->flag & PSYS_ENABLED) { + psmd->modifier.mode |= eModifierMode_Realtime; + } + else { + psmd->modifier.mode &= ~eModifierMode_Realtime; + PE_free_particle_edit(psys); + } + + DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); + allqueue(REDRAWVIEW3D, 0); + allqueue(REDRAWBUTSOBJECT, 0); + allqueue(REDRAWBUTSEDIT, 0); + } + break; case B_PART_RECALC: case B_PART_RECALC_CHILD: if(psys){ @@ -4200,7 +4217,7 @@ static void object_panel_particle_system(Object *ob) butx=0; buty-=5; - uiDefButBitI(block, TOG, PSYS_ENABLED, B_PART_REDRAW, "Enabled", 0,(buty-=buth),100,buth, &psys->flag, 0, 0, 0, 0, "Sets particle system to be calculated and shown"); + uiDefButBitI(block, TOG, PSYS_ENABLED, B_PART_ENABLE, "Enabled", 0,(buty-=buth),100,buth, &psys->flag, 0, 0, 0, 0, "Sets particle system to be calculated and shown"); if(part->type == PART_HAIR){ if(psys->flag & PSYS_EDITED) |