diff options
author | Janne Karhu <jhkarh@gmail.com> | 2011-02-18 10:42:38 +0300 |
---|---|---|
committer | Janne Karhu <jhkarh@gmail.com> | 2011-02-18 10:42:38 +0300 |
commit | c4d7bb80f508b123d13581b4189ab7293105d98c (patch) | |
tree | 403226c1f25cc9aab5e9ba57a0877a9a91b7eeb0 | |
parent | bb05b259429c61ed489135fa9feb2174df124c26 (diff) |
"Fix" for [#26130] Turbulence Force Field seed does not look to generate a new texture when the seed changes via IPO keyframe
* Small force field ui changes to make things a bit clearer.
-rw-r--r-- | release/scripts/ui/properties_physics_common.py | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object_force.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/ui/properties_physics_common.py index c16a0df0167..e6900b162ba 100644 --- a/release/scripts/ui/properties_physics_common.py +++ b/release/scripts/ui/properties_physics_common.py @@ -232,8 +232,9 @@ def basic_force_field_settings_ui(self, context, field): col.prop(field, "flow") col = split.column() - col.prop(field, "noise") - col.prop(field, "seed") + sub = col.column(align=True) + sub.prop(field, "noise") + sub.prop(field, "seed") if field.type == 'TURBULENCE': col.prop(field, "use_global_coords", text="Global") elif field.type == 'HARMONIC': diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index fb8617bc626..e0809510751 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -1169,7 +1169,7 @@ static void rna_def_field(BlenderRNA *brna) prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "f_size"); RNA_def_property_range(prop, 0.0f, 10.0f); - RNA_def_property_ui_text(prop, "Size", "Size of the noise"); + RNA_def_property_ui_text(prop, "Size", "Size of the turbulence"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); prop= RNA_def_property(srna, "rest_length", PROP_FLOAT, PROP_NONE); @@ -1223,7 +1223,7 @@ static void rna_def_field(BlenderRNA *brna) prop= RNA_def_property(srna, "noise", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "f_noise"); RNA_def_property_range(prop, 0.0f, 10.0f); - RNA_def_property_ui_text(prop, "Noise", "Noise of the force"); + RNA_def_property_ui_text(prop, "Noise", "Amount of noise for the force strength"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); prop= RNA_def_property(srna, "seed", PROP_INT, PROP_UNSIGNED); |