diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2021-05-26 13:43:03 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2021-05-26 13:43:03 +0300 |
| commit | 8a6604f253e22bbade3dcf60b9a1c437ace44151 (patch) | |
| tree | fee875d0a0b09fbe0df52aa83094159144048205 /source/blender/shader_fx/intern/FX_shader_glow.c | |
| parent | edf1b833674a6e54df7a16c14f0c6193fbbb482e (diff) | |
| parent | afec66c024dc2b75447537d45406c06342ec201e (diff) | |
Merge branch 'master' into temp-gpencil-maskingtemp-gpencil-masking
Conflicts:
source/blender/blenloader/intern/versioning_300.c
Diffstat (limited to 'source/blender/shader_fx/intern/FX_shader_glow.c')
| -rw-r--r-- | source/blender/shader_fx/intern/FX_shader_glow.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/shader_fx/intern/FX_shader_glow.c b/source/blender/shader_fx/intern/FX_shader_glow.c index 30eaa35a049..fc75771cd62 100644 --- a/source/blender/shader_fx/intern/FX_shader_glow.c +++ b/source/blender/shader_fx/intern/FX_shader_glow.c @@ -71,12 +71,11 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE); - if (mode == eShaderFxGlowMode_Luminance) { - uiItemR(layout, ptr, "threshold", 0, NULL, ICON_NONE); - } - else { + uiItemR(layout, ptr, "threshold", 0, NULL, ICON_NONE); + if (mode == eShaderFxGlowMode_Color) { uiItemR(layout, ptr, "select_color", 0, NULL, ICON_NONE); } + uiItemR(layout, ptr, "glow_color", 0, NULL, ICON_NONE); uiItemS(layout); |