archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Effectors on particle hair can now be applied to the children instead

Browse Source 
of the parents, with the "Children" button next to Stiffness.
This commit is contained in:
Brecht Van Lommel
2008-02-15 12:54:43 +00:00
parent 113b684e07
commit e63d03afc7
4 changed files with 65 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/src/buttons_object.c
View File

@@ -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;