[Bf-blender-cvs] [7e99e396a99] master: Fluid: Naming and UI visibility fixes for some parameters

[Sebastián Barschkis]

Commit: 7e99e396a9991538d3a2d34a69b7a1cf1cbce7d8
Author: Sebastián Barschkis
Date:   Wed Feb 12 00:45:01 2020 +0100
Branches: master
https://developer.blender.org/rB7e99e396a9991538d3a2d34a69b7a1cf1cbce7d8

Fluid: Naming and UI visibility fixes for some parameters

Cleaned up some inconsistencies in the UI, i.e. corrected name for velocity factor and fixed UI visibility for fractional obstacle parameter.

===================================================================

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 7c2077a178c..1eaaeb81772 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -481,8 +481,9 @@ class PHYSICS_PT_liquid(PhysicButtonsPanel, Panel):
 
         col = flow.column()
         col.prop(domain, "use_fractions", text="Fractional Obstacles")
-        col.active = domain.use_fractions
-        col.prop(domain, "fractions_threshold", text="Obstacle-Fluid Threshold")
+        col1 = col.column()
+        col1.enabled = domain.use_fractions
+        col1.prop(domain, "fractions_threshold", text="Obstacle-Fluid Threshold")
 
 
 class PHYSICS_PT_flow_source(PhysicButtonsPanel, Panel):
@@ -1145,7 +1146,7 @@ class PHYSICS_PT_cache(PhysicButtonsPanel, Panel):
         if md.domain_settings.domain_type in {'LIQUID'}:
             # File format for all particle systemes (FLIP and secondary)
             col = flow.column()
-            col.enabled = not is_baking_any and not has_baked_particles
+            col.enabled = not is_baking_any and not has_baked_particles and not has_baked_data
             col.prop(domain, "cache_particle_format", text="Particle File Format")
 
             if domain.use_mesh:
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index 01f240e715b..65aaaad3852 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -1326,6 +1326,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
   RNA_def_property_enum_items(prop, domain_types);
   RNA_def_property_enum_funcs(prop, NULL, "rna_Fluid_domaintype_set", NULL);
   RNA_def_property_ui_text(prop, "Domain Type", "Change domain type of the simulation");
+  RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
   RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Fluid_flip_parts_update");
 
   /* smoke domain options */
@@ -1865,7 +1866,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
   RNA_def_property_range(prop, 0.0, 100.0);
   RNA_def_property_ui_text(
       prop,
-      "Weight",
+      "Velocity Factor",
       "Guiding velocity factor (higher value results in greater guiding velocities)");
   RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset");