Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2021-08-05 18:06:21 +0300
committerAntonio Vazquez <blendergit@gmail.com>2021-08-05 18:07:21 +0300
commitb4f950cbbe5d1306f7bdcff6a288381759e04aeb (patch)
treeb5ec00cfc41d635482dd5bd047877f7bbf706ebd /source
parentcc4e674e41f9ddca9d3b6aee8c21ddcb3fdfea26 (diff)
GPencil: New Caps icons
These icons are used to define the type of caps. Designed by: Matias Mendiola Reviewed by: Pablo Vazquez
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/datafiles/CMakeLists.txt2
-rw-r--r--source/blender/editors/include/UI_icons.h4
-rw-r--r--source/blender/makesrna/intern/rna_brush.c4
3 files changed, 6 insertions, 4 deletions
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},
};