diff options
author | Nathan Craddock <nzcraddock@gmail.com> | 2020-11-18 05:55:49 +0300 |
---|---|---|
committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-11-18 05:55:49 +0300 |
commit | 80a701c4e6cbca59d445b9cf01b2c69dc8404738 (patch) | |
tree | 728090abb267cbc380414c5b22b3d71e1b01d9a2 | |
parent | bbdfeb751e16d939482d2e4b95c4d470f53f18a5 (diff) | |
parent | a352baccc399378333c4352ed83772b49f7ba852 (diff) |
Merge branch 'blender-v2.91-release'
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index d99ecf2fd56..b7eb5cab7f9 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -263,7 +263,7 @@ DEF_ICON(LIBRARY_DATA_BROKEN) DEF_ICON(BOIDS) DEF_ICON(STRANDS) DEF_ICON(LIBRARY_DATA_INDIRECT) -DEF_ICON_OBJECT_DATA(GREASEPENCIL) +DEF_ICON(GREASEPENCIL) DEF_ICON_SHADING(LINE_DATA) DEF_ICON(LIBRARY_DATA_OVERRIDE) DEF_ICON(GROUP_BONE) diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 68d837ba4b4..90f5172f6ec 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -2263,7 +2263,7 @@ int UI_icon_from_idcode(const int idcode) case ID_CU: return ICON_CURVE_DATA; case ID_GD: - return ICON_GREASEPENCIL; + return ICON_OUTLINER_DATA_GREASEPENCIL; case ID_GR: return ICON_OUTLINER_COLLECTION; case ID_IM: |