diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-07-10 20:18:48 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-07-10 20:18:48 +0400 |
| commit | 4b80e1aba2e6f92b08ceddca2cab7d108ef8fac0 (patch) | |
| tree | 25314bc064fbd9fc4607400fcd8f793be87a8343 /source/blender/makesrna/intern/rna_object_force.c | |
| parent | 77faef7b5f9d0d1cc80bff88e261ff8028f621cf (diff) | |
| parent | b62a956cc8c9402880d249d0a70c880af5813bc3 (diff) | |
Merge with trunk r38281
Diffstat (limited to 'source/blender/makesrna/intern/rna_object_force.c')
| -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 11c350e3011..2a4ea815260 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -926,13 +926,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); |