UI: Changes to Viewport Display UI of Volume Object and Fluid

- Density, interpolation and slicing options in Volume Object's
  Viewport Display are now not aligned to each other as they are not
  closely related.
- Changed the enum property for slicing ('Method') to a boolean
  property 'Slice' and added a sub-panel for slicing options under
  the 'Viewport Display' panel in Volume Object and Fluid for better
  clarity.
- Renamed `axis_slice_method` to `use_slice` in the python API for
  Volume Object and Fluid.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D9097

1 files changed, 29 insertions, 8 deletions

diff --git a/release/scripts/startup/bl_ui/properties_data_volume.py b/release/scripts/startup/bl_ui/properties_data_volume.py
index af2c94ad423..0a8bbd19b63 100644
--- a/release/scripts/startup/bl_ui/properties_data_volume.py
+++ b/release/scripts/startup/bl_ui/properties_data_volume.py
@@ -142,9 +142,6 @@ class DATA_PT_volume_viewport_display(DataButtonsPanel, Panel):
 
         volume = context.volume
         display = volume.display
-        axis_slice_method = display.axis_slice_method
-
-        do_full_slicing = (axis_slice_method == 'FULL')
 
         col = layout.column(align=True)
         col.prop(display, "wireframe_type")
@@ -152,14 +149,37 @@ class DATA_PT_volume_viewport_display(DataButtonsPanel, Panel):
         sub.active = display.wireframe_type in {'BOXES', 'POINTS'}
         sub.prop(display, "wireframe_detail", text="Detail")
 
-        col = layout.column(align=True)
+        col = layout.column()
         col.prop(display, "density")
         col.prop(display, "interpolation_method")
-        col.prop(display, "axis_slice_method")
 
-        if not do_full_slicing:
-            col.prop(display, "slice_axis")
-            col.prop(display, "slice_depth")
+
+class DATA_PT_volume_viewport_display_slicing(DataButtonsPanel, Panel):
+    bl_label = ""
+    bl_parent_id = 'DATA_PT_volume_viewport_display'
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
+
+    def draw_header(self, context):
+        layout = self.layout
+
+        volume = context.volume
+        display = volume.display
+
+        layout.prop(display, "use_slice")
+
+    def draw(self, context):
+        layout = self.layout
+        layout.use_property_split = True
+        layout.use_property_decorate = False
+
+        volume = context.volume
+        display = volume.display
+
+        layout.active = display.use_slice
+
+        col = layout.column()
+        col.prop(display, "slice_axis")
+        col.prop(display, "slice_depth")
 
 
 class DATA_PT_custom_props_volume(DataButtonsPanel, PropertyPanel, Panel):
@@ -173,6 +193,7 @@ classes = (
     DATA_PT_volume_grids,
     DATA_PT_volume_file,
     DATA_PT_volume_viewport_display,
+    DATA_PT_volume_viewport_display_slicing,
     DATA_PT_volume_render,
     DATA_PT_custom_props_volume,
     VOLUME_UL_grids,