blender
/
blender
136
408
Fork 592
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

Merge branch 'blender-v2.91-release'

This commit is contained in:
Nathan Craddock 2020-11-17 19:55:49 -07:00
parent bbdfeb751e a352baccc3
commit 80a701c4e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/UI_icons.h
View File

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

2
source/blender/editors/interface/interface_icons.c
View File

@ -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: