[Bf-blender-cvs] [e5615c78356] greasepencil-object: UI: Include Stroke and Fill as subpanels of Surface Panel.

[Antonio Vazquez]

Commit: e5615c783563981a3db25a86c0f886418c3832c0
Author: Antonio Vazquez
Date:   Thu Jun 7 17:39:21 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe5615c783563981a3db25a86c0f886418c3832c0

UI: Include Stroke and Fill as subpanels of Surface Panel.

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

M	release/scripts/startup/bl_ui/properties_material_gpencil.py

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

diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 0f5c44ae51e..037646b09d9 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -137,9 +137,18 @@ class MATERIAL_PT_gpencil_slots(Panel):
             split.template_ID(space, "pin_id")
             split.separator()
 
+class MATERIAL_PT_gpencil_surface(GPMaterialButtonsPanel, Panel):
+    bl_label = "Surface"
+
+    @staticmethod
+    def draw(self, context):
+        layout = self.layout
+        layout.use_property_split = True
+
 
 class MATERIAL_PT_gpencil_strokecolor(GPMaterialButtonsPanel, Panel):
     bl_label = "Stroke"
+    bl_parent_id = 'MATERIAL_PT_gpencil_surface'
 
     @staticmethod
     def draw(self, context):
@@ -171,6 +180,7 @@ class MATERIAL_PT_gpencil_strokecolor(GPMaterialButtonsPanel, Panel):
 
 class MATERIAL_PT_gpencil_fillcolor(GPMaterialButtonsPanel, Panel):
     bl_label = "Fill"
+    bl_parent_id = 'MATERIAL_PT_gpencil_surface'
 
     @staticmethod
     def draw(self, context):
@@ -251,6 +261,7 @@ class MATERIAL_PT_gpencil_options(GPMaterialButtonsPanel, Panel):
 classes = (
     GPENCIL_UL_matslots,
     MATERIAL_PT_gpencil_slots,
+    MATERIAL_PT_gpencil_surface,
     MATERIAL_PT_gpencil_strokecolor,
     MATERIAL_PT_gpencil_fillcolor,
     MATERIAL_PT_gpencil_options,