From c26ee3ab575c69a4ccc8158b1d87f0dcf16bd667 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Thu, 29 Oct 2009 22:08:09 +0000 Subject: [PATCH] * Tiny Force Field Layout improvements and tooltip fix by nudelZ. Thanks! --- release/scripts/ui/buttons_physics_common.py | 17 +++++++++++------ release/scripts/ui/buttons_physics_field.py | 2 +- .../blender/makesrna/intern/rna_object_force.c | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/release/scripts/ui/buttons_physics_common.py b/release/scripts/ui/buttons_physics_common.py index 17ac1b2bbaa..411d6e62ad0 100644 --- a/release/scripts/ui/buttons_physics_common.py +++ b/release/scripts/ui/buttons_physics_common.py @@ -123,10 +123,16 @@ def basic_force_field_settings_ui(self, field): if field.type == 'TURBULENCE': col.itemR(field, "global_coordinates", text="Global") - row = layout.row() - row.itemL(text="Effect point:") - row.itemR(field, "do_location") - row.itemR(field, "do_rotation") + split = layout.split() + + col = split.column() + col.itemL(text="Effect point:") + col.itemR(field, "do_location") + col.itemR(field, "do_rotation") + + sub = split.column() + sub.itemL(text="Collision:") + sub.itemR(field, "do_absorption") def basic_force_field_falloff_ui(self, field): @@ -140,7 +146,6 @@ def basic_force_field_falloff_ui(self, field): col.itemR(field, "z_direction", text="") col.itemR(field, "use_min_distance", text="Use Minimum") col.itemR(field, "use_max_distance", text="Use Maximum") - col.itemR(field, "do_absorption") col = split.column() col.itemR(field, "falloff_power", text="Power") @@ -151,4 +156,4 @@ def basic_force_field_falloff_ui(self, field): sub = col.column() sub.active = field.use_max_distance - sub.itemR(field, "maximum_distance", text="Distance") \ No newline at end of file + sub.itemR(field, "maximum_distance", text="Distance") diff --git a/release/scripts/ui/buttons_physics_field.py b/release/scripts/ui/buttons_physics_field.py index 9aec0404ab1..a47791609ac 100644 --- a/release/scripts/ui/buttons_physics_field.py +++ b/release/scripts/ui/buttons_physics_field.py @@ -197,4 +197,4 @@ class PHYSICS_PT_collision(PhysicButtonsPanel): col.itemR(settings, "damping", text="Factor", slider=True) bpy.types.register(PHYSICS_PT_field) -bpy.types.register(PHYSICS_PT_collision) +bpy.types.register(PHYSICS_PT_collision) \ No newline at end of file diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 2247e5499fb..e15d4917554 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -1056,12 +1056,12 @@ 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 wind force"); + RNA_def_property_ui_text(prop, "Noise", "Noise of the force"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); prop= RNA_def_property(srna, "seed", PROP_INT, PROP_UNSIGNED); RNA_def_property_range(prop, 1, 128); - RNA_def_property_ui_text(prop, "Seed", "Seed of the wind noise"); + RNA_def_property_ui_text(prop, "Seed", "Seed of the noise"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); /* Boolean */