From 8f55794c0e803ec5454febe2e45651c721f62c8f Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Tue, 10 Sep 2019 08:07:39 -0700 Subject: UI: File Browser Custom Folder Color Allows file browser folders to be shown in a theme-selectable color, default of manila. Differential Revision: https://developer.blender.org/D5713 Reviewed by Brecht Van Lommel --- source/blender/editors/include/UI_icons.h | 6 +++++- source/blender/editors/include/UI_resources.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/include') diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 29892657086..dd052a8256b 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -42,6 +42,9 @@ #ifndef DEF_ICON_SHADING # define DEF_ICON_SHADING DEF_ICON #endif +#ifndef DEF_ICON_FOLDER +# define DEF_ICON_FOLDER DEF_ICON +#endif #ifndef DEF_ICON_COLOR # define DEF_ICON_COLOR DEF_ICON #endif @@ -793,7 +796,7 @@ DEF_ICON(NEWFOLDER) DEF_ICON_BLANK(794) DEF_ICON(FILE_PARENT) DEF_ICON(FILE_REFRESH) -DEF_ICON(FILE_FOLDER) +DEF_ICON_FOLDER(FILE_FOLDER) DEF_ICON(FILE_BLANK) DEF_ICON(FILE_BLEND) DEF_ICON(FILE_IMAGE) @@ -1034,6 +1037,7 @@ DEF_ICON_COLOR(EVENT_RETURN) #undef DEF_ICON_OBJECT_DATA #undef DEF_ICON_MODIFIER #undef DEF_ICON_SHADING +#undef DEF_ICON_FOLDER #undef DEF_ICON_VECTOR #undef DEF_ICON_COLOR #undef DEF_ICON_FUND diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 29022adac6c..1c317ac458b 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -273,6 +273,7 @@ typedef enum ThemeColorID { TH_ICON_OBJECT_DATA, TH_ICON_MODIFIER, TH_ICON_SHADING, + TH_ICON_FOLDER, TH_ICON_FUND, TH_SCROLL_TEXT, -- cgit v1.2.3