diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-15 15:54:43 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-15 15:54:43 +0300 |
commit | e63d03afc79d51f9f08a02c6f31362ebd61fdd69 (patch) | |
tree | 94b5b233a1e2b93dbfd0d629abb6ab34b16b78d9 /source/blender/src/buttons_object.c | |
parent | 113b684e07416833dec815db4b4a010a4bf99df2 (diff) |
Effectors on particle hair can now be applied to the children instead
of the parents, with the "Children" button next to Stiffness.
Diffstat (limited to 'source/blender/src/buttons_object.c')
-rw-r--r-- | source/blender/src/buttons_object.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 63e4c087e71..d136e19f61f 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -4182,8 +4182,12 @@ static void object_panel_particle_extra(Object *ob) buty=butx=160; uiDefButI(block, NUM, B_PART_DISTR, "Seed:", butx,(buty-=buth),butw,buth, &psys->seed, 0.0, 255.0, 1, 0, "Set an offset in the random table"); - if(part->type == PART_HAIR && psys->flag & PSYS_EDITED) - uiDefButF(block, NUM, B_PART_RECALC, "Stiff:", butx,(buty-=buth),butw,buth, &part->eff_hair, 0.0, 1.0, 0, 0, "Hair stiffness for effectors"); + if(part->type == PART_HAIR && psys->flag & PSYS_EDITED) { + uiBlockBeginAlign(block); + uiDefButF(block, NUM, B_PART_RECALC, "Stiff:", butx,(buty-=buth),(butw*3)/5,buth, &part->eff_hair, 0.0, 1.0, 0, 0, "Hair stiffness for effectors"); + uiDefButBitI(block, TOG, PART_CHILD_EFFECT, B_PART_RECALC, "Children", butx+(butw*3)/5,buty,(butw*2)/5,buth, &part->flag, 0, 0, 0, 0, "Apply effectors to children"); + uiBlockEndAlign(block); + } else buty-=buth; |