Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-20 19:04:20 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-20 19:10:12 +0300
commit5189bef65485353d9563c6e95e2b9005ea649676 (patch)
treef16c738913e128934fe21d2306897a9fcbf45d0d
parentb5446f01fd3f430b2c348d597f31e2bbaef006f9 (diff)
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.
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c6
1 files changed, 5 insertions, 1 deletions
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);