archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

"Fix" for [#26130] Turbulence Force Field seed does not look to generate a new texture when the seed changes via IPO keyframe

Browse Source 
* Small force field ui changes to make things a bit clearer.
This commit is contained in:
Janne Karhu
2011-02-18 07:42:38 +00:00
parent bb05b25942
commit c4d7bb80f5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/ui/properties_physics_common.py
View File

@@ -232,8 +232,9 @@ def basic_force_field_settings_ui(self, context, field):
col.prop(field, "flow") col.prop(field, "flow")
col = split.column() col = split.column()
col.prop(field, "noise") sub = col.column(align=True)
col.prop(field, "seed") sub.prop(field, "noise")
sub.prop(field, "seed")
if field.type == 'TURBULENCE': if field.type == 'TURBULENCE':
col.prop(field, "use_global_coords", text="Global") col.prop(field, "use_global_coords", text="Global")
elif field.type == 'HARMONIC': elif field.type == 'HARMONIC':

4
source/blender/makesrna/intern/rna_object_force.c
View File

@@ -1169,7 +1169,7 @@ static void rna_def_field(BlenderRNA *brna)
prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE); prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "f_size"); RNA_def_property_float_sdna(prop, NULL, "f_size");
RNA_def_property_range(prop, 0.0f, 10.0f); 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"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update");
prop= RNA_def_property(srna, "rest_length", PROP_FLOAT, PROP_NONE); 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); prop= RNA_def_property(srna, "noise", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "f_noise"); RNA_def_property_float_sdna(prop, NULL, "f_noise");
RNA_def_property_range(prop, 0.0f, 10.0f); 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"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update");
prop= RNA_def_property(srna, "seed", PROP_INT, PROP_UNSIGNED); prop= RNA_def_property(srna, "seed", PROP_INT, PROP_UNSIGNED);