diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-09 18:07:06 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-09 20:55:10 +0300 |
| commit | 9b924d73da90526f5caf31b01dfd34156337f075 (patch) | |
| tree | c5d193baaef3cdc3e9f5dc6933aebb11be057a7c /source/blender/editors/include/UI_icons.h | |
| parent | 930ae8e3c422f6c875ae933480dc4a4a9b2c2c51 (diff) | |
Themes: add scene icon color category, for consistency in properties tab bar
The icons here still need to be dimmed when the tab is inactive.
Diffstat (limited to 'source/blender/editors/include/UI_icons.h')
| -rw-r--r-- | source/blender/editors/include/UI_icons.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index c68f47da447..9ee9e952856 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -24,6 +24,9 @@ /* Note: this is included multiple times with different #defines for DEF_ICON. */ /* Auto define more specific types for places that do not need the distinction. */ +#ifndef DEF_ICON_SCENE +# define DEF_ICON_SCENE DEF_ICON +#endif #ifndef DEF_ICON_COLLECTION # define DEF_ICON_COLLECTION DEF_ICON #endif @@ -133,8 +136,8 @@ DEF_ICON_SHADING(MATERIAL) DEF_ICON_SHADING(TEXTURE) DEF_ICON(ANIM) DEF_ICON_SHADING(WORLD) -DEF_ICON(SCENE) -DEF_ICON(OUTPUT) +DEF_ICON_SCENE(SCENE) +DEF_ICON_SCENE(OUTPUT) DEF_ICON_BLANK(145) DEF_ICON_BLANK(146) DEF_ICON(SCRIPT) @@ -142,7 +145,7 @@ DEF_ICON_MODIFIER(PARTICLES) DEF_ICON_MODIFIER(PHYSICS) DEF_ICON_OBJECT_DATA(SPEAKER) DEF_ICON_BLANK(151) -DEF_ICON(TOOL_SETTINGS) +DEF_ICON_SCENE(TOOL_SETTINGS) DEF_ICON_MODIFIER(SHADERFX) DEF_ICON_MODIFIER(MODIFIER) DEF_ICON_BLANK(155) @@ -211,8 +214,8 @@ DEF_ICON(TRACKING_REFINE_FORWARDS) DEF_ICON_BLANK(77b) /* DATA */ -DEF_ICON(SCENE_DATA) -DEF_ICON(RENDERLAYERS) +DEF_ICON_SCENE(SCENE_DATA) +DEF_ICON_SCENE(RENDERLAYERS) DEF_ICON_SHADING(WORLD_DATA) DEF_ICON_OBJECT(OBJECT_DATA) DEF_ICON_OBJECT_DATA(MESH_DATA) @@ -244,7 +247,7 @@ DEF_ICON_SHADING(IMAGE_DATA) DEF_ICON(FILE) DEF_ICON(FCURVE) DEF_ICON_OBJECT_DATA(FONT_DATA) -DEF_ICON(RENDER_RESULT) +DEF_ICON_SCENE(RENDER_RESULT) DEF_ICON_OBJECT_DATA(SURFACE_DATA) DEF_ICON_OBJECT_DATA(EMPTY_DATA) DEF_ICON(PRESET) @@ -1022,6 +1025,7 @@ DEF_ICON_COLOR(EVENT_RETURN) #undef DEF_ICON #undef DEF_ICON_ERROR +#undef DEF_ICON_SCENE #undef DEF_ICON_COLLECTION #undef DEF_ICON_OBJECT #undef DEF_ICON_OBJECT_DATA |