[Bf-blender-cvs] [f6b793ea7c3] soc-2020-fluid-tools: Fluid: Minor UX improvements

[Sriharsha Kotcharlakot]

Commit: f6b793ea7c36a2f7cdf9d388892a28583ab1fe61
Author: Sriharsha Kotcharlakot
Date:   Mon Jun 29 17:25:46 2020 +0530
Branches: soc-2020-fluid-tools
https://developer.blender.org/rBf6b793ea7c36a2f7cdf9d388892a28583ab1fe61

Fluid: Minor UX improvements

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

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 b632a976a56..f96d5fc11e2 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -1260,10 +1260,7 @@ class PHYSICS_PT_viewport_display(PhysicButtonsPanel, Panel):
 
         if (not (domain.use_color_ramp and domain.coba_field == "FLAGS")):
             col.prop(domain, "display_interpolation")
-        
-        col.separator()
 
-        col = flow.column()
         col.prop(domain, "axis_slice_method")
 
         if not do_full_slicing:
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index 995fb0f06f0..ee9ab65bbe4 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -1107,29 +1107,29 @@ static const EnumPropertyItem *rna_Fluid_cobafield_itemf(bContext *UNUSED(C),
     tmp.value = FLUID_DOMAIN_FIELD_PHI;
     tmp.identifier = "PHI";
     tmp.icon = 0;
-    tmp.name = "Phi";
-    tmp.description = "Phi grid";
+    tmp.name = "Fluid Levelset";
+    tmp.description = "Levelset representation of the fluid";
     RNA_enum_item_add(&item, &totitem, &tmp);
 
     tmp.value = FLUID_DOMAIN_FIELD_PHI_IN;
     tmp.identifier = "PHI_IN";
     tmp.icon = 0;
-    tmp.name = "Phi In";
-    tmp.description = "Phi In grid";
+    tmp.name = "Inflow Levelset";
+    tmp.description = "Levelset representation of the inflow";
     RNA_enum_item_add(&item, &totitem, &tmp);
 
     tmp.value = FLUID_DOMAIN_FIELD_PHI_OUT;
     tmp.identifier = "PHI_OUT";
     tmp.icon = 0;
-    tmp.name = "Phi Out";
-    tmp.description = "Phi Out grid";
+    tmp.name = "Outflow Levelset";
+    tmp.description = "Levelset representation of the outflow";
     RNA_enum_item_add(&item, &totitem, &tmp);
 
     tmp.value = FLUID_DOMAIN_FIELD_PHI_OBSTACLE;
     tmp.identifier = "PHI_OBSTACLE";
     tmp.icon = 0;
-    tmp.name = "Phi Obstacle";
-    tmp.description = "Phi Obstacle grid";
+    tmp.name = "Obstacle Levelset";
+    tmp.description = "Levelset representation of the obstacles";
     RNA_enum_item_add(&item, &totitem, &tmp);
   }