[Bf-blender-cvs] [5189bef6548] master: Fix outliner drawing unselected active objects as if they are selected

[Brecht Van Lommel]

Commit: 5189bef65485353d9563c6e95e2b9005ea649676
Author: Brecht Van Lommel
Date:   Mon May 20 18:04:20 2019 +0200
Branches: master
https://developer.blender.org/rB5189bef65485353d9563c6e95e2b9005ea649676

Fix outliner drawing unselected active objects as if they are selected

Now we always draw a roundbox behind the active object icon, and only change
the text color if the active object is also selected. This matches the 3D
viewport better.

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

M	source/blender/editors/space_outliner/outliner_draw.c

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index f34f280a29d..3a3cdafc1f5 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2811,7 +2811,11 @@ static void outliner_draw_tree_element(bContext *C,
                                         BKE_view_layer_base_find(view_layer, ob);
         const bool is_selected = (base != NULL) && ((base->flag & BASE_SELECTED) != 0);
 
-        if (ob == obact || is_selected) {
+        if (ob == obact) {
+          active = OL_DRAWSEL_ACTIVE;
+        }
+
+        if (is_selected) {
           if (ob == obact) {
             /* active selected object */
             UI_GetThemeColor3ubv(TH_ACTIVE_OBJECT, text_color);