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:
authorWilliam Reynish <billrey@me.com>2020-01-31 15:06:36 +0300
committerWilliam Reynish <billrey@me.com>2020-01-31 15:20:24 +0300
commiteea3751c5bb2aef421cb7117add0f860da06d7af (patch)
treef7902eb3cd9f3d1580e843616fbbe134096938f7 /source
parent53d805abcbf0a68155025a186d8a3c60de4af374 (diff)
UI: Icons update
- New bespoke icon for the universal brush toggles - New icon for Redirected Folder (currently unused) - New icons for handle types (Auto Clamped, Auto, Aligned, Vector, Free) - New icons for Sequencer Text Strip anchor (Top, Bottom, Left, Right, Centre) Thanks to Andrzej Ambroż for the new icons
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/include/UI_icons.h24
-rw-r--r--source/blender/makesrna/intern/rna_curve.c14
-rw-r--r--source/blender/makesrna/intern/rna_sequencer.c12
3 files changed, 23 insertions, 27 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 44c734e264a..fabf6baed23 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -134,7 +134,7 @@ DEF_ICON(RECOVER_LAST)
DEF_ICON(THREE_DOTS)
DEF_ICON(FULLSCREEN_ENTER)
DEF_ICON(FULLSCREEN_EXIT)
-DEF_ICON_BLANK(135)
+DEF_ICON(BRUSHES_ALL)
/* BUTTONS */
DEF_ICON_SHADING(LIGHT)
@@ -452,11 +452,11 @@ DEF_ICON(NODE_INSERT_OFF)
DEF_ICON(NODE_TOP)
DEF_ICON(NODE_SIDE)
DEF_ICON(NODE_CORNER)
-DEF_ICON_BLANK(698)
-DEF_ICON_BLANK(699)
-DEF_ICON_BLANK(700)
-DEF_ICON_BLANK(701)
-DEF_ICON_BLANK(702)
+DEF_ICON(ANCHOR_TOP)
+DEF_ICON(ANCHOR_BOTTOM)
+DEF_ICON(ANCHOR_LEFT)
+DEF_ICON(ANCHOR_RIGHT)
+DEF_ICON(ANCHOR_CENTER)
DEF_ICON_BLANK(703)
DEF_ICON_BLANK(704)
DEF_ICON_BLANK(705)
@@ -793,7 +793,7 @@ DEF_ICON(BOOKMARKS)
DEF_ICON(FONTPREVIEW)
DEF_ICON(FILTER)
DEF_ICON(NEWFOLDER)
-DEF_ICON_BLANK(794)
+DEF_ICON(FOLDER_REDIRECT)
DEF_ICON(FILE_PARENT)
DEF_ICON(FILE_REFRESH)
DEF_ICON_FOLDER(FILE_FOLDER)
@@ -876,11 +876,11 @@ DEF_ICON(IMAGE_RGB) // XXX CHANGE TO STRAIGHT ALPHA, Z ETC
DEF_ICON(IMAGE_RGB_ALPHA)
DEF_ICON(IMAGE_ALPHA)
DEF_ICON(IMAGE_ZDEPTH)
-DEF_ICON_BLANK(877)
-DEF_ICON_BLANK(878)
-DEF_ICON_BLANK(879)
-DEF_ICON_BLANK(880)
-DEF_ICON_BLANK(881)
+DEF_ICON(HANDLE_AUTOCLAMPED)
+DEF_ICON(HANDLE_AUTO)
+DEF_ICON(HANDLE_ALIGNED)
+DEF_ICON(HANDLE_VECTOR)
+DEF_ICON(HANDLE_FREE)
DEF_ICON_BLANK(882)
DEF_ICON_BLANK(883)
DEF_ICON_BLANK(884)
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index e900160a653..b295a169c83 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -51,29 +51,25 @@ static const EnumPropertyItem beztriple_handle_type_items[] = {
#endif
const EnumPropertyItem rna_enum_keyframe_handle_type_items[] = {
- {HD_FREE,
- "FREE",
- ICON_HANDLETYPE_FREE_VEC,
- "Free",
- "Completely independent manually set handle"},
+ {HD_FREE, "FREE", ICON_HANDLE_FREE, "Free", "Completely independent manually set handle"},
{HD_ALIGN,
"ALIGNED",
- ICON_HANDLETYPE_ALIGNED_VEC,
+ ICON_HANDLE_ALIGNED,
"Aligned",
"Manually set handle with rotation locked together with its pair"},
{HD_VECT,
"VECTOR",
- ICON_HANDLETYPE_VECTOR_VEC,
+ ICON_HANDLE_VECTOR,
"Vector",
"Automatic handles that create straight lines"},
{HD_AUTO,
"AUTO",
- ICON_HANDLETYPE_AUTO_VEC,
+ ICON_HANDLE_AUTO,
"Automatic",
"Automatic handles that create smooth curves"},
{HD_AUTO_ANIM,
"AUTO_CLAMPED",
- ICON_HANDLETYPE_AUTO_CLAMP_VEC,
+ ICON_HANDLE_AUTOCLAMPED,
"Auto Clamped",
"Automatic handles that create smooth curves which only change direction at keyframes"},
{0, NULL, 0, NULL, NULL},
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index 2c5f93e28ed..16dbe38f866 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -2701,15 +2701,15 @@ static void rna_def_text(StructRNA *srna)
{
/* Avoid text icons because they imply this aligns within a frame, see: T71082 */
static const EnumPropertyItem text_align_x_items[] = {
- {SEQ_TEXT_ALIGN_X_LEFT, "LEFT", 0, "Left", ""},
- {SEQ_TEXT_ALIGN_X_CENTER, "CENTER", 0, "Center", ""},
- {SEQ_TEXT_ALIGN_X_RIGHT, "RIGHT", 0, "Right", ""},
+ {SEQ_TEXT_ALIGN_X_LEFT, "LEFT", ICON_ANCHOR_LEFT, "Left", ""},
+ {SEQ_TEXT_ALIGN_X_CENTER, "CENTER", ICON_ANCHOR_CENTER, "Center", ""},
+ {SEQ_TEXT_ALIGN_X_RIGHT, "RIGHT", ICON_ANCHOR_RIGHT, "Right", ""},
{0, NULL, 0, NULL, NULL},
};
static const EnumPropertyItem text_align_y_items[] = {
- {SEQ_TEXT_ALIGN_Y_TOP, "TOP", 0, "Top", ""},
- {SEQ_TEXT_ALIGN_Y_CENTER, "CENTER", 0, "Center", ""},
- {SEQ_TEXT_ALIGN_Y_BOTTOM, "BOTTOM", 0, "Bottom", ""},
+ {SEQ_TEXT_ALIGN_Y_TOP, "TOP", ICON_ANCHOR_TOP, "Top", ""},
+ {SEQ_TEXT_ALIGN_Y_CENTER, "CENTER", ICON_ANCHOR_CENTER, "Center", ""},
+ {SEQ_TEXT_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ANCHOR_BOTTOM, "Bottom", ""},
{0, NULL, 0, NULL, NULL},
};