[Bf-blender-cvs] [55e95e84d76] soc-2019-outliner: Outliner: Only draw active highlight when syncing selection

Nathan Craddock noreply at git.blender.org
Wed Jun 26 23:06:43 CEST 2019


Commit: 55e95e84d7613f14af9e7420c7d8857fa4951eb3
Author: Nathan Craddock
Date:   Wed Jun 26 14:12:10 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB55e95e84d7613f14af9e7420c7d8857fa4951eb3

Outliner: Only draw active highlight when syncing selection

When synced selection is off, it makes no sense to draw
active highlights, especially because they may be out of
sync from view layer active highlights

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

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 113592c3a71..793dac1d281 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -3307,7 +3307,8 @@ static void outliner_draw_highlights_recursive(unsigned pos,
     const int start_y = *io_start_y;
 
     /* selection status */
-    if ((tselem->flag & TSE_ACTIVE) && (tselem->flag & TSE_SELECTED)) {
+    if ((soops->flag & SO_SYNC_SELECTION) && (tselem->flag & TSE_ACTIVE) &&
+        (tselem->flag & TSE_SELECTED)) {
       immUniformColor4fv(col_active);
       immRecti(pos, 0, start_y, (int)ar->v2d.cur.xmax, start_y + UI_UNIT_Y);
     }



More information about the Bf-blender-cvs mailing list