diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-04-14 14:09:44 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-04-14 14:09:44 +0400 |
| commit | 3dcb3cc4cdbf2147365c51941d8c3863c9c8890b (patch) | |
| tree | 9111139b02d0f4a88912a3c59423d8d2143701d1 | |
| parent | ca5821af2585ba4f439ff561730a8d7f6884a55e (diff) | |
Bugfix: modifier buttons in the particle panel were locked unnecessarily
with edited hair.
| -rw-r--r-- | source/blender/src/buttons_object.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 652ad7cac05..b7f92919cd7 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -4909,6 +4909,14 @@ static void object_panel_particle_system(Object *ob) } + md= (ModifierData*)psys_get_modifier(ob, psys); + if(md) { + uiBlockBeginAlign(block); + uiDefIconButBitI(block, TOG, eModifierMode_Render, B_PART_RECALC, ICON_SCENE, butx+butw-40, buty, 20, 20,&md->mode, 0, 0, 1, 0, "Enable particle system during rendering"); + but= uiDefIconButBitI(block, TOG, eModifierMode_Realtime, B_PART_RECALC, VICON_VIEW3D, butx+butw-20, buty, 20, 20,&md->mode, 0, 0, 1, 0, "Enable particle system during interactive display"); + uiBlockEndAlign(block); + } + if(psys->flag & PSYS_EDITED) { lockmessage= "Hair is edited!"; lock= 1; @@ -4923,14 +4931,6 @@ static void object_panel_particle_system(Object *ob) uiDefButS(block, MENU, B_PARTTYPE, "Type%t|Hair%x2|Reactor%x1|Emitter%x0", butx,buty,butw-45,buth, &part->type, 14.0, 0.0, 0, 0, "Type of particle system"); - md= (ModifierData*)psys_get_modifier(ob, psys); - if(md) { - uiBlockBeginAlign(block); - uiDefIconButBitI(block, TOG, eModifierMode_Render, B_PART_RECALC, ICON_SCENE, butx+butw-40, buty, 20, 20,&md->mode, 0, 0, 1, 0, "Enable particle system during rendering"); - but= uiDefIconButBitI(block, TOG, eModifierMode_Realtime, B_PART_RECALC, VICON_VIEW3D, butx+butw-20, buty, 20, 20,&md->mode, 0, 0, 1, 0, "Enable particle system during interactive display"); - uiBlockEndAlign(block); - } - buty-=5; uiDefBut(block, LABEL, 0, "Basic:", butx,(buty-=buth),butw,buth, NULL, 0.0, 0, 0, 0, ""); uiBlockBeginAlign(block); |