From 9fbba61f4b4b95b7f4d9e8c45b3db57dc97fe15d Mon Sep 17 00:00:00 2001
From: William Reynish <billreynish>
Date: Wed, 31 Oct 2018 17:30:47 +0100
Subject: UI: icon set updates by Andrzej Ambroz.

New icons for duplicate, driver types, window, hue/saturation.
---
 source/blender/editors/include/UI_icons.h              | 16 ++++++++--------
 source/blender/editors/interface/interface_templates.c |  4 ++--
 source/blender/editors/space_outliner/outliner_draw.c  |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'source/blender/editors')

diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index cde88e13b1f..34ce9bd1fbe 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -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)
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 7acbb0633b5..0ed835bac19 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -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));
 	}
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index ba8522199c6..19af0371373 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -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;
-- 
cgit v1.2.3