Grease Pencil naming: Use clear names for depth ordering

- Add a new panel to differentiate between viewport display and stroke options
- Use clearer naming for depth ordering and stroke thickness properties

Reviewers: antoniov
Differential Revision: https://developer.blender.org/D4405

1 files changed, 28 insertions, 13 deletions

diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index a910cbe823f..8b4b927ffde 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -332,8 +332,8 @@ class DATA_PT_gpencil_vertexpanel(DataButtonsPanel, Panel):
             layout.prop(context.tool_settings, "vertex_group_weight", text="Weight")
 
 
-class DATA_PT_gpencil_display(DataButtonsPanel, Panel):
-    bl_label = "Viewport Display"
+class DATA_PT_gpencil_strokes(DataButtonsPanel, Panel):
+    bl_label = "Strokes"
     bl_options = {'DEFAULT_CLOSED'}
 
     def draw(self, context):
@@ -344,27 +344,41 @@ class DATA_PT_gpencil_display(DataButtonsPanel, Panel):
         ob = context.object
 
         gpd = context.gpencil_data
-        gpl = context.active_gpencil_layer
 
-        layout.prop(gpd, "xray_mode", text="Depth Ordering")
-        if gpd.xray_mode == '3DSPACE':
-            layout.prop(gpd, "draw_mode", text="Mode")
-
-        layout.prop(ob, "empty_display_size", text="Marker Size")
+        layout.prop(gpd, "object_depth_order")
+        if gpd.object_depth_order == '3DSPACE':
+            layout.prop(gpd, "stroke_depth_order")
 
         col = layout.column(align=True)
-        col.prop(gpd, "show_constant_thickness")
+        col.prop(gpd, "stroke_thickness_space")
         sub = col.column()
-        sub.active = not gpd.show_constant_thickness
+        sub.active = gpd.stroke_thickness_space == 'WORLDSPACE'
         sub.prop(gpd, "pixel_factor", text="Thickness Scale")
 
+        layout.prop(gpd, "use_force_fill_recalc", text="Force Fill Update")
+        layout.prop(gpd, "use_adaptive_uv", text="Adaptive UVs")
+
+
+class DATA_PT_gpencil_display(DataButtonsPanel, Panel):
+    bl_label = "Viewport Display"
+    bl_options = {'DEFAULT_CLOSED'}
+
+    def draw(self, context):
+        layout = self.layout
+        layout.use_property_split = True
+        layout.use_property_decorate = False
+
+        ob = context.object
+
+        gpd = context.gpencil_data
+        gpl = context.active_gpencil_layer
+
+        layout.prop(ob, "empty_display_size", text="Marker Size")
+
         layout.prop(gpd, "edit_line_color", text="Edit Line Color")
         if gpl:
             layout.prop(gpd, "show_stroke_direction", text="Show Stroke Directions")
 
-        layout.prop(gpd, "use_force_fill_recalc", text="Force Fill Update")
-        layout.prop(gpd, "use_adaptive_uv", text="Adaptive UVs")
-
 
 class DATA_PT_gpencil_canvas(DataButtonsPanel, Panel):
     bl_label = "Canvas"
@@ -402,6 +416,7 @@ classes = (
     DATA_PT_gpencil_layer_optionpanel,
     DATA_PT_gpencil_parentpanel,
     DATA_PT_gpencil_vertexpanel,
+    DATA_PT_gpencil_strokes,
     DATA_PT_gpencil_display,
     DATA_PT_gpencil_canvas,
     DATA_PT_custom_props_gpencil,