diff options
author | Janne Karhu <jhkarh@gmail.com> | 2010-02-26 06:24:21 +0300 |
---|---|---|
committer | Janne Karhu <jhkarh@gmail.com> | 2010-02-26 06:24:21 +0300 |
commit | cf4ba30f79991e9804a6fb2b8c746b50e5cf1878 (patch) | |
tree | e1c5426dba141c4693157e7d605c19aae12c825d /source/blender/makesrna/intern/rna_cloth.c | |
parent | 59e2fdbf31380fc8bf8c0543344233bd2bee7133 (diff) |
Few small hair dynamics goodies:
* Effectors now work with hair dynamics.
* Hair dynamics has a new "Collider Friction" parameter that works similarly to internal friction except now all collision objects effect the hair velocity. Useful for quick'n'dirty interaction with objects as the calculations are really fast, but doesn't really take away the need for proper hair-object collisions.
Diffstat (limited to 'source/blender/makesrna/intern/rna_cloth.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_cloth.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index 961e0708adc..4ecb93eb1d6 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -225,6 +225,12 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Internal Friction", ""); RNA_def_property_update(prop, 0, "rna_cloth_update"); + prop= RNA_def_property(srna, "collider_friction", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "collider_friction"); + RNA_def_property_range(prop, 0.0f, 1.0f); + RNA_def_property_ui_text(prop, "Collider Friction", ""); + RNA_def_property_update(prop, 0, "rna_cloth_update"); + /* mass */ prop= RNA_def_property(srna, "mass", PROP_FLOAT, PROP_NONE); |