[Bf-blender-cvs] [cc7a57c34e0] lanpr-under-gp: LineArt: Move Linea Art mask panel as subpanel

[Antonio Vazquez]

Commit: cc7a57c34e0e50ac816f93cdbe56e2a17f37601a
Author: Antonio Vazquez
Date:   Sun Aug 16 18:35:23 2020 +0200
Branches: lanpr-under-gp
https://developer.blender.org/rBcc7a57c34e0e50ac816f93cdbe56e2a17f37601a

LineArt: Move Linea Art mask panel as subpanel

Also moved to properties_material_gpencil.py

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py
index 6d76b53b167..877df6c6fea 100644
--- a/release/scripts/startup/bl_ui/properties_material.py
+++ b/release/scripts/startup/bl_ui/properties_material.py
@@ -276,34 +276,6 @@ class MATERIAL_PT_viewport(MaterialButtonsPanel, Panel):
         col.prop(mat, "roughness")
 
 
-class MATERIAL_PT_lineart(MaterialButtonsPanel, Panel):
-    bl_label = "Line Art"
-    bl_context = "material"
-    bl_options = {'DEFAULT_CLOSED'}
-
-    def draw(self, context):
-        layout = self.layout
-
-        mat = context.material
-        lineart = mat.lineart
-
-        layout.prop(lineart, "use_transparency")
-
-        if lineart.use_transparency:
-
-            layout.label(text="Transparency Masks:")
-
-            row = layout.row(align=True)
-            row.prop(lineart, "transparency_mask_0", text="0", toggle=True)
-            row.prop(lineart, "transparency_mask_1", text="1", toggle=True)
-            row.prop(lineart, "transparency_mask_2", text="2", toggle=True)
-            row.prop(lineart, "transparency_mask_3", text="3", toggle=True)
-            row.prop(lineart, "transparency_mask_4", text="4", toggle=True)
-            row.prop(lineart, "transparency_mask_5", text="5", toggle=True)
-            row.prop(lineart, "transparency_mask_6", text="6", toggle=True)
-            row.prop(lineart, "transparency_mask_7", text="7", toggle=True)
-
-
 classes = (
     MATERIAL_MT_context_menu,
     MATERIAL_UL_matslots,
@@ -315,7 +287,6 @@ classes = (
     MATERIAL_PT_viewport,
     EEVEE_MATERIAL_PT_viewport_settings,
     MATERIAL_PT_custom_props,
-    MATERIAL_PT_lineart,
 )
 
 
diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 5d10a2cef4a..c60f582f4b6 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -261,6 +261,34 @@ class MATERIAL_PT_gpencil_material_presets(PresetPanel, Panel):
     preset_add_operator = "scene.gpencil_material_preset_add"
 
 
+class MATERIAL_PT_lineart(GPMaterialButtonsPanel, Panel):
+    bl_label = "Line Art"
+    bl_parent_id = 'MATERIAL_PT_gpencil_surface'
+    bl_options = {'DEFAULT_CLOSED'}
+
+    def draw(self, context):
+        layout = self.layout
+
+        mat = context.material
+        lineart = mat.lineart
+
+        layout.prop(lineart, "use_transparency")
+
+        if lineart.use_transparency:
+
+            layout.label(text="Transparency Masks:")
+
+            row = layout.row(align=True)
+            row.prop(lineart, "transparency_mask_0", text="0", toggle=True)
+            row.prop(lineart, "transparency_mask_1", text="1", toggle=True)
+            row.prop(lineart, "transparency_mask_2", text="2", toggle=True)
+            row.prop(lineart, "transparency_mask_3", text="3", toggle=True)
+            row.prop(lineart, "transparency_mask_4", text="4", toggle=True)
+            row.prop(lineart, "transparency_mask_5", text="5", toggle=True)
+            row.prop(lineart, "transparency_mask_6", text="6", toggle=True)
+            row.prop(lineart, "transparency_mask_7", text="7", toggle=True)
+
+
 classes = (
     GPENCIL_UL_matslots,
     GPENCIL_MT_material_context_menu,
@@ -272,6 +300,7 @@ classes = (
     MATERIAL_PT_gpencil_fillcolor,
     MATERIAL_PT_gpencil_options,
     MATERIAL_PT_gpencil_custom_props,
+    MATERIAL_PT_lineart,
 )
 
 if __name__ == "__main__":  # only for live edit.