[Bf-blender-cvs] [02c1eb15d0a] greasepencil-object: GPencil: Disable Glow Under if Regular mode is selected

[Antonio Vazquez]

Commit: 02c1eb15d0af7d43beafca39466eb6060c53693b
Author: Antonio Vazquez
Date:   Mon Feb 17 16:54:11 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB02c1eb15d0af7d43beafca39466eb6060c53693b

GPencil: Disable Glow Under if Regular mode is selected

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_data_shaderfx.py b/release/scripts/startup/bl_ui/properties_data_shaderfx.py
index f3124ba597e..2a596368b15 100644
--- a/release/scripts/startup/bl_ui/properties_data_shaderfx.py
+++ b/release/scripts/startup/bl_ui/properties_data_shaderfx.py
@@ -137,14 +137,16 @@ class DATA_PT_shader_fx(ShaderFxButtonsPanel, Panel):
             layout.prop(fx, "select_color")
 
         layout.separator()
-        row = layout.row()
-        row.enabled = not (fx.use_glow_under and fx.blend_mode == 'REGULAR')
-        row.prop(fx, "blend_mode", text="Blend")
+        layout.prop(fx, "blend_mode", text="Blend")
 
         layout.prop(fx, "radius")
         layout.prop(fx, "rotation")
         layout.prop(fx, "samples")
-        layout.prop(fx, "use_glow_under", text="Glow Under")
+
+        if fx.blend_mode != 'REGULAR':
+            layout.prop(fx, "use_glow_under", text="Glow Under")
+        else:
+            layout.label(text="Glow Under not supported in Regular blend", icon="ERROR")
 
     def FX_SWIRL(self, layout, fx):
         layout.prop(fx, "object", text="Object")