[Bf-blender-cvs] [b2a716e033d] soc-2019-outliner: Outliner: Add active element theme color

[Nathan Craddock]

Commit: b2a716e033d0578d14a041899d37a4b241be83b5
Author: Nathan Craddock
Date:   Tue May 28 16:04:03 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBb2a716e033d0578d14a041899d37a4b241be83b5

Outliner: Add active element theme color

Adds a themable color for the outliner's active elements in both light and default themes

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

M	release/datafiles/userdef/userdef_default_theme.c
M	release/scripts/presets/interface_theme/blender_light.xml
M	source/blender/makesdna/DNA_outliner_types.h
M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesrna/intern/rna_userdef.c

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

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index b5cab405826..fa12c51e468 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -749,6 +749,7 @@ const bTheme U_theme_default = {
     .facedot_size = 4,
     .match = RGBA(0x337f334c),
     .selected_highlight = RGBA(0x314e784c),
+    .active_highlight = RGBA(0x59749d4c),
     .selected_object = RGBA(0xe96a00ff),
     .active_object = RGBA(0xffaf29ff),
     .edited_object = RGBA(0x00806266),
diff --git a/release/scripts/presets/interface_theme/blender_light.xml b/release/scripts/presets/interface_theme/blender_light.xml
index 45c500e0c80..3b2a3a87408 100644
--- a/release/scripts/presets/interface_theme/blender_light.xml
+++ b/release/scripts/presets/interface_theme/blender_light.xml
@@ -983,6 +983,7 @@
       <ThemeOutliner
         match="#337f33"
         selected_highlight="#7a8e99"
+        active_highlight="#92aab7"
         selected_object="#ffddb3"
         active_object="#ffffff"
         edited_object="#0080624d"
diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h
index 1462d955f81..6fdb92ea496 100644
--- a/source/blender/makesdna/DNA_outliner_types.h
+++ b/source/blender/makesdna/DNA_outliner_types.h
@@ -53,13 +53,14 @@ typedef struct TreeStore {
 enum {
   TSE_CLOSED = (1 << 0),
   TSE_SELECTED = (1 << 1),
-  TSE_TEXTBUT = (1 << 2),
-  TSE_CHILDSEARCH = (1 << 3),
-  TSE_SEARCHMATCH = (1 << 4),
-  TSE_HIGHLIGHTED = (1 << 5),
-  TSE_DRAG_INTO = (1 << 6),
-  TSE_DRAG_BEFORE = (1 << 7),
-  TSE_DRAG_AFTER = (1 << 8),
+  TSE_ACTIVE = (1 << 2),
+  TSE_TEXTBUT = (1 << 3),
+  TSE_CHILDSEARCH = (1 << 4),
+  TSE_SEARCHMATCH = (1 << 5),
+  TSE_HIGHLIGHTED = (1 << 6),
+  TSE_DRAG_INTO = (1 << 7),
+  TSE_DRAG_BEFORE = (1 << 8),
+  TSE_DRAG_AFTER = (1 << 9),
   TSE_DRAG_ANY = (TSE_DRAG_INTO | TSE_DRAG_BEFORE | TSE_DRAG_AFTER),
 };
 
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 9cab63dbfeb..931e69fd33c 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -363,6 +363,8 @@ typedef struct ThemeSpace {
   char match[4];
   /** Outliner - selected item. */
   char selected_highlight[4];
+  /** Outliner - active item. */
+  char active_highlight[4];
   /** Outliner - selected object. */
   char selected_object[4];
   /** Outliner - active object. */
@@ -407,8 +409,6 @@ typedef struct ThemeSpace {
 
   char metadatabg[4];
   char metadatatext[4];
-
-  char _pad2[4];
 } ThemeSpace;
 
 /* set of colors for use as a custom color set for Objects/Bones wire drawing */
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index b53abacadf2..543c65deb96 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -2279,6 +2279,11 @@ static void rna_def_userdef_theme_space_outliner(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Selected Highlight", "");
   RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
 
+  prop = RNA_def_property(srna, "active_highlight", PROP_FLOAT, PROP_COLOR_GAMMA);
+  RNA_def_property_array(prop, 3);
+  RNA_def_property_ui_text(prop, "Active Highlight", "");
+  RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
+
   prop = RNA_def_property(srna, "selected_object", PROP_FLOAT, PROP_COLOR_GAMMA);
   RNA_def_property_array(prop, 3);
   RNA_def_property_ui_text(prop, "Selected Objects", "");