archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: icon set updates by Andrzej Ambroz.

Browse Source 
New icons for duplicate, driver types, window, hue/saturation.
This commit is contained in:
William Reynish
2018-10-31 17:30:47 +01:00
committed by Brecht Van Lommel
parent 4b7b1ba114
commit 9fbba61f4b
88 changed files with 464 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@ DEF_ICON(GRIP)
DEF_ICON(DOT)
DEF_ICON(COLLAPSEMENU)
DEF_ICON(X)
DEF_ICON_BLANK(74)
DEF_ICON(DUPLICATE)
DEF_ICON_BLANK(75)
DEF_ICON_BLANK(76)
DEF_ICON_BLANK(77)
@@ -79,7 +79,7 @@ DEF_ICON(NODE)
DEF_ICON(NODE_SEL)
/* ui */
DEF_ICON_BLANK(FULLSCREEN)
DEF_ICON(WINDOW)
DEF_ICON(WORKSPACE)
DEF_ICON(RIGHTARROW_THIN)
DEF_ICON(BORDERMOVE)
@@ -87,7 +87,7 @@ DEF_ICON(VIEWZOOM)
DEF_ICON(ADD)
DEF_ICON(REMOVE)
DEF_ICON(PANEL_CLOSE)
DEF_ICON_COLOR(COPY_ID)
DEF_ICON(COPY_ID)
DEF_ICON(EYEDROPPER)
DEF_ICON_BLANK(92)
DEF_ICON(AUTO)
@@ -118,9 +118,9 @@ DEF_ICON(ZOOM_SELECTED)
DEF_ICON(ZOOM_PREVIOUS)
DEF_ICON(ZOOM_IN)
DEF_ICON(ZOOM_OUT)
DEF_ICON_BLANK(121)
DEF_ICON_BLANK(122)
DEF_ICON_BLANK(123)
DEF_ICON(DRIVER_DISTANCE)
DEF_ICON(DRIVER_ROTATIONAL_DIFFERENCE)
DEF_ICON(DRIVER_TRANSFORM)
DEF_ICON(FREEZE)
DEF_ICON(STYLUS_PRESSURE)
DEF_ICON(GHOST_DISABLED)
@@ -282,7 +282,7 @@ DEF_ICON(MOUSE_LMB_DRAG)
DEF_ICON(MOUSE_MMB_DRAG)
DEF_ICON(MOUSE_RMB_DRAG)
DEF_ICON_BLANK(284)
DEF_ICON_BLANK(285)
DEF_ICON(PRESET_NEW)
DEF_ICON_BLANK(286)
DEF_ICON(DECORATE)
DEF_ICON(DECORATE_KEYFRAME)
@@ -718,8 +718,8 @@ DEF_ICON_BLANK(243)
DEF_ICON_BLANK(244)
DEF_ICON_BLANK(245)
DEF_ICON(NORMALS_VERTEX)
DEF_ICON(NORMALS_VERTEX_FACE)
DEF_ICON(NORMALS_FACE)
DEF_ICON(NORMALS_VERTEX_FACE)
/* 3D VIEW */
DEF_ICON(SHADING_BBOX)

4
source/blender/editors/interface/interface_templates.c
View File

@@ -623,13 +623,13 @@ static uiBut *template_id_def_new_but(
if (newop) {
but = uiDefIconTextButO(
block, but_type, newop, WM_OP_INVOKE_DEFAULT, ICON_ADD,
block, but_type, newop, WM_OP_INVOKE_DEFAULT, (id) ? ICON_DUPLICATE : ICON_ADD,
(id) ? "" : CTX_IFACE_(template_id_context(type), "New"), 0, 0, w, but_height, NULL);
UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_ADD_NEW));
}
else {
but = uiDefIconTextBut(
block, but_type, 0, ICON_ADD, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"),
block, but_type, 0, (id) ? ICON_DUPLICATE : ICON_ADD, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"),
0, 0, w, but_height, NULL, 0, 0, 0, 0, NULL);
UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_ADD_NEW));
}

2
source/blender/editors/space_outliner/outliner_draw.c
View File

@@ -1075,7 +1075,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
data.icon = ICON_MOD_MASK;
break;
case eGpencilModifierType_Color:
data.icon = ICON_MOD_TINT;
data.icon = ICON_MOD_HUE_SATURATION;
break;
case eGpencilModifierType_Lattice:
data.icon = ICON_MOD_LATTICE;

2
source/blender/makesrna/intern/rna_ID.c
View File

@@ -82,7 +82,7 @@ const EnumPropertyItem rna_enum_id_type_items[] = {
{ID_SPK, "SPEAKER", ICON_SPEAKER, "Speaker", ""},
{ID_TXT, "TEXT", ICON_TEXT, "Text", ""},
{ID_TE, "TEXTURE", ICON_TEXTURE_DATA, "Texture", ""},
{ID_WM, "WINDOWMANAGER", ICON_WORKSPACE, "Window Manager", ""},
{ID_WM, "WINDOWMANAGER", ICON_WINDOW, "Window Manager", ""},
{ID_WO, "WORLD", ICON_WORLD_DATA, "World", ""},
{ID_WS, "WORKSPACE", ICON_WORKSPACE, "Workspace", ""},
{0, NULL, 0, NULL, NULL}

6
source/blender/makesrna/intern/rna_fcurve.c
View File

@@ -1554,10 +1554,10 @@ static void rna_def_drivervar(BlenderRNA *brna)
static const EnumPropertyItem prop_type_items[] = {
{DVAR_TYPE_SINGLE_PROP, "SINGLE_PROP", ICON_RNA, "Single Property", "Use the value from some RNA property (Default)"},
{DVAR_TYPE_TRANSFORM_CHAN, "TRANSFORMS", ICON_ORIENTATION_GLOBAL, "Transform Channel",
{DVAR_TYPE_TRANSFORM_CHAN, "TRANSFORMS", ICON_DRIVER_TRANSFORM, "Transform Channel",
"Final transformation value of object or bone"},
{DVAR_TYPE_ROT_DIFF, "ROTATION_DIFF", ICON_PARTICLE_TIP, "Rotational Difference", "Use the angle between two bones"}, /* XXX: Icon... */
{DVAR_TYPE_LOC_DIFF, "LOC_DIFF", ICON_FULLSCREEN_ENTER, "Distance", "Distance between two bones or objects"}, /* XXX: Icon... */
{DVAR_TYPE_ROT_DIFF, "ROTATION_DIFF", ICON_DRIVER_ROTATIONAL_DIFFERENCE, "Rotational Difference", "Use the angle between two bones"},
{DVAR_TYPE_LOC_DIFF, "LOC_DIFF", ICON_DRIVER_DISTANCE, "Distance", "Distance between two bones or objects"},
{0, NULL, 0, NULL, NULL}
};

2
source/blender/makesrna/intern/rna_gpencil_modifier.c
View File

@@ -76,7 +76,7 @@ const EnumPropertyItem rna_enum_object_greasepencil_modifier_type_items[] = {
{eGpencilModifierType_Thick, "GP_THICK", ICON_MOD_THICKNESS, "Thickness", "Change stroke thickness"},
{eGpencilModifierType_Time, "GP_TIME", ICON_MOD_TIME, "Time Offset", "Offset keyframes"},
{0, "", 0, N_("Color"), "" },
{eGpencilModifierType_Color, "GP_COLOR", ICON_MOD_TINT, "Hue/Saturation", "Apply changes to stroke colors"},
{eGpencilModifierType_Color, "GP_COLOR", ICON_MOD_HUE_SATURATION, "Hue/Saturation", "Apply changes to stroke colors"},
{eGpencilModifierType_Opacity, "GP_OPACITY", ICON_MOD_OPACITY, "Opacity", "Opacity of the strokes"},
{eGpencilModifierType_Tint, "GP_TINT", ICON_MOD_TINT, "Tint", "Tint strokes with new color"},
{0, NULL, 0, NULL, NULL}