Fix T61376 Group Node Node Editor theme property is missing alpha channel
authorSebastian Parborg <darkdefende@gmail.com>
Mon, 11 Feb 2019 15:56:20 +0000 (16:56 +0100)
committerSebastian Parborg <darkdefende@gmail.com>
Mon, 11 Feb 2019 15:56:20 +0000 (16:56 +0100)
It is now possible to adjust the group node background alpha.
The defaults are the same as before, but you can now adjust the alpha
level via the theme preferences (and the alpha value is no longer hard
coded).

release/datafiles/userdef/userdef_default_theme.c
source/blender/editors/space_node/node_draw.c
source/blender/makesrna/intern/rna_userdef.c

index aa275d6..9c195fe 100644 (file)
@@ -786,7 +786,7 @@ const bTheme U_theme_default = {
                .syntaxb = RGBA(0xccb83dff),
                .syntaxn = RGBA(0xe64555ff),
                .syntaxv = RGBA(0x66c4ffff),
-               .syntaxc = RGBA(0x426628ff),
+               .syntaxc = RGBA(0x426628b9),
                .syntaxd = RGBA(0x749797ff),
                .syntaxr = RGBA(0x808080ff),
                .nodeclass_output = RGBA(0xb33641ff),
index c599334..69a6d53 100644 (file)
@@ -1307,7 +1307,7 @@ static void draw_group_overlay(const bContext *C, ARegion *ar)
        /* shade node groups to separate them visually */
        GPU_blend(true);
 
-       UI_GetThemeColorShadeAlpha4fv(TH_NODE_GROUP, 0, -70, color);
+       UI_GetThemeColorShadeAlpha4fv(TH_NODE_GROUP, 0, 0, color);
        UI_draw_roundbox_corner_set(UI_CNR_NONE);
        UI_draw_roundbox_4fv(true, rect.xmin, rect.ymin, rect.xmax, rect.ymax, 0, color);
        GPU_blend(false);
index 603a633..8122ffe 100644 (file)
@@ -2394,7 +2394,7 @@ static void rna_def_userdef_theme_space_node(BlenderRNA *brna)
 
        prop = RNA_def_property(srna, "group_node", PROP_FLOAT, PROP_COLOR_GAMMA);
        RNA_def_property_float_sdna(prop, NULL, "syntaxc");
-       RNA_def_property_array(prop, 3);
+       RNA_def_property_array(prop, 4);
        RNA_def_property_ui_text(prop, "Group Node", "");
        RNA_def_property_update(prop, 0, "rna_userdef_update");