diff options
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index db1eacf57dc..5c4da1f5e53 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -515,6 +515,13 @@ static void init_brush_icons(void) INIT_BRUSH_ICON(ICON_BRUSH_THUMB, thumb); INIT_BRUSH_ICON(ICON_BRUSH_ROTATE, twist); INIT_BRUSH_ICON(ICON_BRUSH_VERTEXDRAW, vertexdraw); + INIT_BRUSH_ICON(ICON_BRUSH_HAIR_COMB, haircomb); + INIT_BRUSH_ICON(ICON_BRUSH_HAIR_CUT, haircut); + INIT_BRUSH_ICON(ICON_BRUSH_HAIR_LENGTH, hairlength); + INIT_BRUSH_ICON(ICON_BRUSH_HAIR_PUFF, hairpuff); + INIT_BRUSH_ICON(ICON_BRUSH_HAIR_ADD, hairadd); + INIT_BRUSH_ICON(ICON_BRUSH_HAIR_SMOOTH, hairsmooth); + INIT_BRUSH_ICON(ICON_BRUSH_HAIR_WEIGHT, hairweight); #undef INIT_BRUSH_ICON } @@ -1308,6 +1315,8 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id) mode = OB_MODE_VERTEX_PAINT; else if (ob->mode & OB_MODE_TEXTURE_PAINT) mode = OB_MODE_TEXTURE_PAINT; + else if (ob->mode & OB_MODE_HAIR_EDIT) + mode = OB_MODE_HAIR_EDIT; } else if ((sima = CTX_wm_space_image(C)) && (sima->mode == SI_MODE_PAINT)) @@ -1328,6 +1337,10 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id) items = brush_image_tool_items; tool = br->imagepaint_tool; } + else if (mode == OB_MODE_HAIR_EDIT) { + items = brush_hair_tool_items; + tool = br->hair_tool; + } if (!items || !RNA_enum_icon_from_value(items, tool, &id->icon_id)) id->icon_id = 0; |