[Bf-blender-cvs] [46567d982fa] greasepencil-object: GP: Disable opacity of Blend layers

[Antonioya]

Commit: 46567d982fa642768aa2869fbad11e7eb9b3d8ba
Author: Antonioya
Date:   Fri Nov 23 19:20:38 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB46567d982fa642768aa2869fbad11e7eb9b3d8ba

GP: Disable opacity of Blend layers

The opacity parameter is not logic for blend layers because the opacity is determined by underlying layers.

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

M	release/scripts/startup/bl_ui/properties_data_gpencil.py
M	release/scripts/startup/bl_ui/space_topbar.py

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

diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 3dc32fa7f81..d64de01651a 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -158,8 +158,9 @@ class DATA_PT_gpencil_datapanel(Panel):
                 sub.operator("gpencil.layer_isolate", icon='LOCKED', text="").affect_visibility = False
                 sub.operator("gpencil.layer_isolate", icon='RESTRICT_VIEW_ON', text="").affect_visibility = True
 
-        row = layout.row(align=True)
         if gpl:
+            row = layout.row(align=True)
+            row.enabled = gpl.blend_mode == 'NORMAL'
             row.prop(gpl, "opacity", text="Opacity", slider=True)
             row = layout.row(align=True)
             row.prop(gpl, "blend_mode", text="Blend")
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 76e5f00dd56..1833aed94aa 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -539,8 +539,9 @@ class TOPBAR_PT_gpencil_layers(Panel):
                 sub.operator("gpencil.layer_isolate", icon='LOCKED', text="").affect_visibility = False
                 sub.operator("gpencil.layer_isolate", icon='HIDE_OFF', text="").affect_visibility = True
 
-        row = layout.row(align=True)
         if gpl:
+            row = layout.row(align=True)
+            row.enabled = gpl.blend_mode == 'NORMAL'
             row.prop(gpl, "opacity", text="Opacity", slider=True)
             row = layout.row(align=True)
             row.prop(gpl, "blend_mode", text="Blend")