diff options
author | Ton Roosendaal <ton@blender.org> | 2011-04-20 20:19:49 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-04-20 20:19:49 +0400 |
commit | 5bd110c6baca4ec080190967a9503121eaef541e (patch) | |
tree | ab84519a387790b4429a81e05078bb307348dd36 /source | |
parent | 8a7dce5301f5448dd3c754d42acddd8f2b556615 (diff) |
Bugfix #27026
Outliner objects showed "active" or "selected" in confusing
ways. Now the display is simply binary, and more in line with
how other items in outliner draw:
- text is white = item is active
- color circle behind icon: shows selection state
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 8fdd62f7412..fce9c883c84 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -4667,16 +4667,24 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene Object *ob= (Object *)tselem->id; if(ob==OBACT || (ob->flag & SELECT)) { - char col[4]; + char col[4]= {0, 0, 0, 0}; - active= 2; + /* outliner active ob: always white text, circle color now similar to view3d */ + + active= 2; /* means it draws a color circle */ if(ob==OBACT) { - UI_GetThemeColorType4ubv(TH_ACTIVE, SPACE_VIEW3D, col); - /* so black text is drawn when active and not selected */ - if (ob->flag & SELECT) active= 1; + if(ob->flag & SELECT) { + UI_GetThemeColorType4ubv(TH_ACTIVE, SPACE_VIEW3D, col); + col[3]= 100; + } + + active= 1; /* means it draws white text */ } - else UI_GetThemeColorType4ubv(TH_SELECT, SPACE_VIEW3D, col); - col[3]= 100; + else if(ob->flag & SELECT) { + UI_GetThemeColorType4ubv(TH_SELECT, SPACE_VIEW3D, col); + col[3]= 100; + } + glColor4ubv((GLubyte *)col); } |