diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-08 17:22:58 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-08 17:22:58 +0400 |
| commit | a5906de7c4f1bd188030ee4b8d9822c7c31fc2ea (patch) | |
| tree | c91d7efd441c773002e6a2c8cb2a78aeabeefa8d /source/blender/makesrna/intern | |
| parent | 668323d7017e73e7171ee691d8d37ebfe79b6ac0 (diff) | |
Fix #26962: softbody collision doesn't respect subsurf+displace modifiers.
Softbody was still using a flag to determine if it should use the final or
deform derivedmesh, but this wans't exposed in the UI. Others systems use the
collision modifier, now softbody uses it also to get vertices and faces, but
with own collision code.
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object_force.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 5d3c29b736b..ca679239dd3 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -910,13 +910,6 @@ static void rna_def_collision(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Damping", "Amount of damping during collision"); RNA_def_property_update(prop, 0, "rna_CollisionSettings_update"); - - /* Does this belong here? - prop= RNA_def_property(srna, "collision_stack", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "softflag", OB_SB_COLLFINAL); - RNA_def_property_ui_text(prop, "Collision from Stack", "Pick collision object from modifier stack (softbody only)"); - RNA_def_property_update(prop, 0, "rna_CollisionSettings_update"); - */ prop= RNA_def_property(srna, "absorption", PROP_FLOAT, PROP_FACTOR); RNA_def_property_range(prop, 0.0f, 1.0f); |