From b4f950cbbe5d1306f7bdcff6a288381759e04aeb Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Thu, 5 Aug 2021 17:06:21 +0200 Subject: GPencil: New Caps icons These icons are used to define the type of caps. Designed by: Matias Mendiola Reviewed by: Pablo Vazquez --- source/blender/editors/datafiles/CMakeLists.txt | 2 ++ source/blender/editors/include/UI_icons.h | 4 ++-- source/blender/makesrna/intern/rna_brush.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 4af6e1bdcb8..c4916b9182f 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -583,6 +583,8 @@ set(ICON_NAMES uv_facesel uv_islandsel uv_sync_select + gp_caps_flat + gp_caps_round fixed_size transform_origins gizmo diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index eb893fbe029..1708c3598b1 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -713,8 +713,8 @@ DEF_ICON(UV_EDGESEL) DEF_ICON(UV_FACESEL) DEF_ICON(UV_ISLANDSEL) DEF_ICON(UV_SYNC_SELECT) -DEF_ICON_BLANK(240) -DEF_ICON_BLANK(241) +DEF_ICON(GP_CAPS_FLAT) +DEF_ICON(GP_CAPS_ROUND) DEF_ICON(FIXED_SIZE) DEF_ICON(TRANSFORM_ORIGINS) DEF_ICON(GIZMO) diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index eb968f9ecde..cdca58df4b0 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -1282,8 +1282,8 @@ static void rna_def_gpencil_options(BlenderRNA *brna) }; static EnumPropertyItem rna_enum_gpencil_brush_caps_types_items[] = { - {GP_STROKE_CAP_ROUND, "ROUND", ICON_HANDLETYPE_AUTO_CLAMP_VEC, "Round", ""}, - {GP_STROKE_CAP_FLAT, "FLAT", ICON_HANDLETYPE_VECTOR_VEC, "Flat", ""}, + {GP_STROKE_CAP_ROUND, "ROUND", ICON_GP_CAPS_ROUND, "Round", ""}, + {GP_STROKE_CAP_FLAT, "FLAT", ICON_GP_CAPS_FLAT, "Flat", ""}, {0, NULL, 0, NULL, NULL}, }; -- cgit v1.2.3