diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-18 19:44:04 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-18 19:44:04 +0400 |
commit | ae15de68168be2be88021eb3e99d7e768eaed34b (patch) | |
tree | c35b4f37eb5bd99a0365a325a8102299f2710d21 | |
parent | 5fcb12d7541dc9e83756f26422b160c97d9a124d (diff) |
Fix part of #33469: cloth preroll had a wrong tooltip and low limit of 200 frames.
-rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_cloth.py | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_cloth.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_cloth.py b/release/scripts/startup/bl_ui/properties_physics_cloth.py index 5a44294f0e0..91b4cc0ae49 100644 --- a/release/scripts/startup/bl_ui/properties_physics_cloth.py +++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py @@ -91,7 +91,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, Panel): sub.prop(cloth, "pin_stiffness", text="Stiffness") col.label(text="Pre roll:") - col.prop(cloth, "pre_roll", text="Frame") + col.prop(cloth, "pre_roll", text="Frames") # Disabled for now """ diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index b9e86e116a2..69de86da007 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -403,8 +403,8 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "pre_roll", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "preroll"); - RNA_def_property_range(prop, 0, 200); - RNA_def_property_ui_text(prop, "Pre Roll", "Simulation starts on this frame"); + RNA_def_property_range(prop, 0, MAXFRAME); + RNA_def_property_ui_text(prop, "Pre Roll", "Start simulation a number of frames earlier to let the cloth settle in"); RNA_def_property_update(prop, 0, "rna_cloth_reset"); prop = RNA_def_property(srna, "rest_shape_key", PROP_POINTER, PROP_NONE); |