[Bf-blender-cvs] [66a8a2584f2] soc-2020-fluid-tools: Replaced `coba_*` with `color_ramp_*` in the Python API for fluid.

[Sriharsha Kotcharlakot]

Commit: 66a8a2584f28f73a045d5bc8db0c68ff1e2f3dbd
Author: Sriharsha Kotcharlakot
Date:   Mon Sep 7 20:59:31 2020 +0530
Branches: soc-2020-fluid-tools
https://developer.blender.org/rB66a8a2584f28f73a045d5bc8db0c68ff1e2f3dbd

Replaced `coba_*` with `color_ramp_*` in the Python API for fluid.

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

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 df50311c8e2..95a3d509f23 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -1268,7 +1268,7 @@ class PHYSICS_PT_viewport_display(PhysicButtonsPanel, Panel):
         sub = col.column()
         sub.prop(domain, "display_interpolation")
 
-        if domain.use_color_ramp and domain.coba_field == 'FLAGS':
+        if domain.use_color_ramp and domain.color_ramp_field == 'FLAGS':
             sub.enabled = False
 
         col.prop(domain, "axis_slice_method")
@@ -1276,7 +1276,7 @@ class PHYSICS_PT_viewport_display(PhysicButtonsPanel, Panel):
         if not do_full_slicing:
             col.prop(domain, "slice_axis")
             col.prop(domain, "slice_depth")
-            if domain.display_interpolation == 'CLOSEST' or domain.coba_field == 'FLAGS':
+            if domain.display_interpolation == 'CLOSEST' or domain.color_ramp_field == 'FLAGS':
                 col.prop(domain, "show_gridlines")
 
         col = col.column()
@@ -1305,14 +1305,14 @@ class PHYSICS_PT_viewport_display_color(PhysicButtonsPanel, Panel):
         domain = context.fluid.domain_settings
         col = layout.column()
         col.active = domain.use_color_ramp
-        col.prop(domain, "coba_field")
+        col.prop(domain, "color_ramp_field")
 
-        if not domain.coba_field == 'FLAGS':
-            col.prop(domain, "coba_field_scale")
+        if not domain.color_ramp_field == 'FLAGS':
+            col.prop(domain, "color_ramp_field_scale")
 
         col.use_property_split = False
 
-        if domain.coba_field[:3] != 'PHI' and domain.coba_field not in {'FLAGS', 'PRESSURE'}:
+        if domain.color_ramp_field[:3] != 'PHI' and domain.color_ramp_field not in {'FLAGS', 'PRESSURE'}:
             col = col.column()
             col.template_color_ramp(domain, "color_ramp", expand=True)
 
@@ -1376,7 +1376,7 @@ class PHYSICS_PT_viewport_display_advanced(PhysicButtonsPanel, Panel):
         col.prop(domain, "gridlines_color_field", text="Color Gridlines")
 
         if domain.gridlines_color_field == 'RANGE':
-            if domain.use_color_ramp and domain.coba_field != 'FLAGS':
+            if domain.use_color_ramp and domain.color_ramp_field != 'FLAGS':
                 col.prop(domain, "gridlines_lower_bound")
                 col.prop(domain, "gridlines_upper_bound")
                 col.prop(domain, "gridlines_range_color")
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index f468ee815a1..dc15652c753 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -2555,14 +2555,14 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
       {0, NULL, 0, NULL, NULL},
   };
 
-  prop = RNA_def_property(srna, "coba_field", PROP_ENUM, PROP_NONE);
+  prop = RNA_def_property(srna, "color_ramp_field", PROP_ENUM, PROP_NONE);
   RNA_def_property_enum_sdna(prop, NULL, "coba_field");
   RNA_def_property_enum_items(prop, coba_field_items);
   RNA_def_property_enum_funcs(prop, NULL, "rna_Fluid_cobafield_set", "rna_Fluid_cobafield_itemf");
   RNA_def_property_ui_text(prop, "Field", "Simulation field to color map");
   RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
 
-  prop = RNA_def_property(srna, "coba_field_scale", PROP_FLOAT, PROP_NONE);
+  prop = RNA_def_property(srna, "color_ramp_field_scale", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_sdna(prop, NULL, "grid_scale");
   RNA_def_property_range(prop, 0.001, 100000.0);
   RNA_def_property_ui_range(prop, 0.001, 1000.0, 0.1, 3);