[Bf-blender-cvs] [1991bd5c658] greasepencil-object: GP: Exchange opacity and blend parameters in Panel

[Antonioya]

Commit: 1991bd5c658064b3ea27ffbb426cf4dd5f95688c
Author: Antonioya
Date:   Fri Nov 23 19:22:49 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB1991bd5c658064b3ea27ffbb426cf4dd5f95688c

GP: Exchange opacity and blend parameters in Panel

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

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 d64de01651a..cc107cb0aee 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -159,11 +159,11 @@ class DATA_PT_gpencil_datapanel(Panel):
                 sub.operator("gpencil.layer_isolate", icon='RESTRICT_VIEW_ON', text="").affect_visibility = True
 
         if gpl:
+            row = layout.row(align=True)
+            row.prop(gpl, "blend_mode", text="Blend")
             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")
 
 
 class DATA_PT_gpencil_layer_optionpanel(LayerDataButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 1833aed94aa..0109917a57a 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -540,11 +540,11 @@ class TOPBAR_PT_gpencil_layers(Panel):
                 sub.operator("gpencil.layer_isolate", icon='HIDE_OFF', text="").affect_visibility = True
 
         if gpl:
+            row = layout.row(align=True)
+            row.prop(gpl, "blend_mode", text="Blend")
             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")
 
 
 class TOPBAR_MT_editor_menus(Menu):