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-06 12:50:50 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-06 12:58:47 +0300
commitb6bf4bda27e1a7460417b0c5e0588d2dae43eb2e (patch)
tree28dc29553504176d79f22bdac4437678026bcf64 /source/blender/editors/interface/resources.c
parentdefc90146741aaef5d02fb260e8a5c1fa3db4970 (diff)
UI: disable colored icons in menus for now
Only a few icons are colored, which caused some random icons to be colored and others not. We can add it back for specific menus later (like add object or modifiers).
Diffstat (limited to 'source/blender/editors/interface/resources.c')
-rw-r--r--source/blender/editors/interface/resources.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 8ed7dd87e9f..6958b82e2d0 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1357,8 +1357,7 @@ bool UI_GetIconThemeColor4fv(int colorid, float col[4])
* 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_WINDOW) ||
- (theme_spacetype == SPACE_PROPERTIES && theme_regionid == RGN_TYPE_NAV_BAR) ||
- (theme_regionid == RGN_TYPE_TEMPORARY))) {
+ (theme_spacetype == SPACE_PROPERTIES && theme_regionid == RGN_TYPE_NAV_BAR))) {
return false;
}