[Bf-blender-cvs] [5fa58fb8a2b] blender-v2.83-release: Fix T76821: Generalize Use Flow Tooltip
Aaron Carlisle
noreply at git.blender.org
Tue May 19 06:54:44 CEST 2020
Commit: 5fa58fb8a2bfbf132055d00dd3491f16f2f8379b
Author: Aaron Carlisle
Date: Tue May 19 00:53:59 2020 -0400
Branches: blender-v2.83-release
https://developer.blender.org/rB5fa58fb8a2bfbf132055d00dd3491f16f2f8379b
Fix T76821: Generalize Use Flow Tooltip
===================================================================
M release/scripts/startup/bl_ui/properties_physics_fluid.py
M source/blender/makesrna/intern/rna_fluid.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index 4b0791a63e6..2c8ed363738 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -237,7 +237,7 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel):
col = grid.column()
col.prop(flow, "flow_behavior", expand=False)
if flow.flow_behavior in {'INFLOW', 'OUTFLOW'}:
- col.prop(flow, "use_inflow", text="Use Flow")
+ col.prop(flow, "use_inflow")
col.prop(flow, "subframes", text="Sampling Substeps")
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index 03b57a496ef..7ffba1caaa9 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -2516,7 +2516,7 @@ static void rna_def_fluid_flow_settings(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_inflow", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", FLUID_FLOW_USE_INFLOW);
- RNA_def_property_ui_text(prop, "Enabled", "Control when to apply inflow");
+ RNA_def_property_ui_text(prop, "Use Flow", "Control when to apply fluid flow");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_flow_reset");
prop = RNA_def_property(srna, "subframes", PROP_INT, PROP_NONE);
More information about the Bf-blender-cvs
mailing list