From d2ad256326736c8a4c746163f9b27491d8a6e95a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 24 Aug 2018 12:54:48 +0200 Subject: UI: add dedicated icon IDs for decorators, tool settings, shaderfx, overlays. The preset and decorator icons were updated to be monochrome and draw in the same color as text. Other icons are unchanged, having them as separate icon IDs prepares for an artist to make them. --- source/blender/editors/interface/interface_anim.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/interface/interface_anim.c') diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index cda70d405ad..d2a5ab80148 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -108,19 +108,19 @@ void ui_but_anim_decorate_update_from_flag(uiBut *but) BLI_assert(UI_but_is_decorator(but) && but->prev); int flag = but->prev->flag; if (flag & UI_BUT_DRIVEN) { - but->icon = ICON_AUTO; + but->icon = ICON_DECORATE_DRIVER; } else if (flag & UI_BUT_ANIMATED_KEY) { - but->icon = ICON_SPACE2; + but->icon = ICON_DECORATE_KEYFRAME; } else if (flag & UI_BUT_ANIMATED) { - but->icon = ICON_SPACE3; + but->icon = ICON_DECORATE_ANIMATE; } else if (flag & UI_BUT_OVERRIDEN) { - but->icon = ICON_LIBRARY_DATA_OVERRIDE; + but->icon = ICON_DECORATE_OVERRIDE; } else { - but->icon = ICON_DOT; + but->icon = ICON_DECORATE; } const int flag_copy = (UI_BUT_DISABLED | UI_BUT_INACTIVE); -- cgit v1.2.3