diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-03 19:20:35 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-03 19:33:23 +0300 |
| commit | 633c773fe4fcf11222f7e460f64d38d5a16e4ccf (patch) | |
| tree | 803faea5af3c3d4541e8298f49d34cb3ad5b2b76 /source/blender/editors/interface/resources.c | |
| parent | a5c89574a3f7e915dd3fe44a73f7f184ce1758e2 (diff) | |
UI: color icons in the properties editor tabs
Still can use more tweaks and icon reorganization, but this gets us closer
to the intended design so we can evaluate it. Ref T61561, T63521.
Diffstat (limited to 'source/blender/editors/interface/resources.c')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 587cccf516c..8ed7dd87e9f 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1356,7 +1356,9 @@ bool UI_GetIconThemeColor4fv(int colorid, float col[4]) /* Only colored icons in outliner and popups, overall UI is intended * to stay monochrome and out of the way except a few places where it * is important to communicate different data types. */ - if (!((theme_spacetype == SPACE_OUTLINER) || (theme_regionid == RGN_TYPE_TEMPORARY))) { + if (!((theme_spacetype == SPACE_OUTLINER && theme_regionid == RGN_TYPE_WINDOW) || + (theme_spacetype == SPACE_PROPERTIES && theme_regionid == RGN_TYPE_NAV_BAR) || + (theme_regionid == RGN_TYPE_TEMPORARY))) { return false; } |