diff options
author | Joseph Eagar <joeedh@gmail.com> | 2011-05-02 01:39:13 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-02 01:39:13 +0400 |
commit | 088899236b0904c0a3d0fc5a92b0cb5ffd35cd17 (patch) | |
tree | 2d528fb9da3bba533e1ae42d7f2baa823d0d1f2e /source/blender/makesrna/intern/rna_cloth.c | |
parent | 7cc98cbb0b6f2ef113a568532eb0921e77cc973d (diff) |
=trunk=
Recommitted eltopo collision code (but disabled by default)
with Genscher's permission.
To use, you need to install liblapack and libblas
Diffstat (limited to 'source/blender/makesrna/intern/rna_cloth.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_cloth.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index a7f308742ac..afd30433c5d 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -428,6 +428,20 @@ static void rna_def_cloth_collision_settings(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flags", CLOTH_COLLSETTINGS_FLAG_ENABLED); RNA_def_property_ui_text(prop, "Enable Collision", "Enable collisions with other objects"); RNA_def_property_update(prop, 0, "rna_cloth_update"); + + prop= RNA_def_property(srna, "repel_force", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "repel_force"); + RNA_def_property_range(prop, 0.0f, 20.0f); + RNA_def_property_float_default(prop, 1.0f); + RNA_def_property_ui_text(prop, "Repulsion Force", "Repulsion force to apply on cloth when close to colliding"); + RNA_def_property_update(prop, 0, "rna_cloth_update"); + + prop= RNA_def_property(srna, "distance_repel", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "distance_repel"); + RNA_def_property_range(prop, 0.001f, 10.0f); + RNA_def_property_float_default(prop, 0.005f); + RNA_def_property_ui_text(prop, "Repulsion Distance", "Maximum distance to apply repulsion force, must be greater then minimum distance"); + RNA_def_property_update(prop, 0, "rna_cloth_update"); prop= RNA_def_property(srna, "distance_min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "epsilon"); |