[Bf-blender-cvs] [b6bf4bda27e] master: UI: disable colored icons in menus for now

[Brecht Van Lommel]

Commit: b6bf4bda27e1a7460417b0c5e0588d2dae43eb2e
Author: Brecht Van Lommel
Date:   Mon May 6 11:50:50 2019 +0200
Branches: master
https://developer.blender.org/rBb6bf4bda27e1a7460417b0c5e0588d2dae43eb2e

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).

===================================================================

M	source/blender/editors/interface/resources.c

===================================================================

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;
   }