diff options
| -rw-r--r-- | release/ui/buttons_physics_fluid.py | 4 | ||||
| -rw-r--r-- | release/ui/buttons_texture.py | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_fluidsim.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/release/ui/buttons_physics_fluid.py b/release/ui/buttons_physics_fluid.py index fe15e22f0b9..6f7a97ff793 100644 --- a/release/ui/buttons_physics_fluid.py +++ b/release/ui/buttons_physics_fluid.py @@ -94,7 +94,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel): col.itemL(text="Slip Type:") col.itemR(fluid, "slip_type", text="") if fluid.slip_type == 'PARTIALSLIP': - col.itemR(fluid, "partial_slip_amount", slider=True, text="Amount") + col.itemR(fluid, "partial_slip_factor", slider=True, text="Amount") col.itemL(text="Impact:") col.itemR(fluid, "impact_factor", text="Factor") @@ -228,7 +228,7 @@ class PHYSICS_PT_domain_boundary(PhysicButtonsPanel): sub = col.column(align=True) sub.itemR(fluid, "slip_type", text="") if fluid.slip_type == 'PARTIALSLIP': - sub.itemR(fluid, "partial_slip_amount", slider=True, text="Amount") + sub.itemR(fluid, "partial_slip_factor", slider=True, text="Amount") col = split.column() col.itemL(text="Surface:") diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py index ad0542d787a..ee3f85e15ef 100644 --- a/release/ui/buttons_texture.py +++ b/release/ui/buttons_texture.py @@ -609,7 +609,7 @@ class TEXTURE_PT_distortednoise(TextureTypePanel): layout.itemR(tex, "noise_basis", text="Basis") flow = layout.column_flow() - flow.itemR(tex, "distortion_amount", text="Distortion") + flow.itemR(tex, "distortion", text="Distortion") flow.itemR(tex, "noise_size", text="Size") flow.itemR(tex, "nabla") diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c index 936e1700ed7..dda21f63528 100644 --- a/source/blender/makesrna/intern/rna_fluidsim.c +++ b/source/blender/makesrna/intern/rna_fluidsim.c @@ -162,7 +162,7 @@ static void rna_def_fluidsim_slip(StructRNA *srna) RNA_def_property_enum_items(prop, slip_items); RNA_def_property_ui_text(prop, "Slip Type", ""); - prop= RNA_def_property(srna, "partial_slip_amount", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "partial_slip_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "partSlipValue"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Partial Slip Amount", "Amount of mixing between no- and free-slip, 0 is no slip and 1 is free slip."); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index f899d52543e..6de0be9b19c 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -1293,7 +1293,7 @@ static void rna_def_texture_distorted_noise(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Distorted Noise", "Procedural distorted noise texture."); RNA_def_struct_sdna(srna, "Tex"); - prop= RNA_def_property(srna, "distortion_amount", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "distortion", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "dist_amount"); RNA_def_property_range(prop, 0, 10); RNA_def_property_ui_text(prop, "Distortion Amount", ""); |