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:
authorPhilipp Oeser <info@graphics-engineer.com>2021-05-26 18:01:58 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-07-08 11:41:38 +0300
commitb6a35a8153c30f5c1516fef6fb5c16482248cdf0 (patch)
tree889b320b6533155c507da881107ffe394b07882a
parent7489427e4de7be344118a4c4d90935f7d7ba9a3e (diff)
Outliner: use 'compacted' row for bones as well
In a collapsed hierarchy, some type of data are listed as one icon per item (2.79 did this for all data), others are 'compacted' as a single icon with a counter (also indicating if the active item is down that collapsed hierarchy) from 2.80 on. Not quite sure if {rB92dfc8f2673e} was meant to do this (if it was, this was not working though because relevant code would only get executed for object hierarchies it seems), so now this is done for bones as well. Fixes T88413. Maniphest Tasks: T88413 Differential Revision: https://developer.blender.org/D11404
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index d1fb36979b4..db37c8c1c8c 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2964,7 +2964,8 @@ static void outliner_draw_iconrow(bContext *C,
te->flag &= ~(TE_ICONROW | TE_ICONROW_MERGED);
/* object hierarchy always, further constrained on level */
- if ((level < 1) || ((tselem->type == TSE_SOME_ID) && (te->idcode == ID_OB))) {
+ if ((level < 1) || ((tselem->type == TSE_SOME_ID) && (te->idcode == ID_OB)) ||
+ ELEM(tselem->type, TSE_BONE, TSE_EBONE, TSE_POSE_CHANNEL)) {
/* active blocks get white circle */
if (tselem->type == TSE_SOME_ID) {
if (te->idcode == ID_OB) {