UI: icon set updates by Andrzej Ambroz.

8 files changed, 15 insertions, 15 deletions

diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 9b4ee0c8264..4bef307f350 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -151,7 +151,7 @@ DEF_ICON(SPEAKER)
 DEF_ICON_BLANK(151)
 DEF_ICON(TOOL_SETTINGS)
 DEF_ICON(SHADERFX)
-DEF_ICON_BLANK(154)
+DEF_ICON(MODIFIER)
 DEF_ICON_BLANK(155)
 DEF_ICON_BLANK(156)
 DEF_ICON_BLANK(157)
@@ -181,18 +181,18 @@ DEF_ICON(NODETREE)
 DEF_ICON_BLANK(181)
 DEF_ICON(CONSOLE)
 DEF_ICON_BLANK(183)
-DEF_ICON(CLIP)
+DEF_ICON(TRACKER)
 DEF_ICON(ASSET_MANAGER)
 DEF_ICON(NODE_COMPOSITING)
 DEF_ICON(NODE_TEXTURE)
 DEF_ICON(NODE_MATERIAL)
-DEF_ICON_BLANK(189)
+DEF_ICON(UV)
 DEF_ICON_BLANK(190)
 
 	/* MODES */
 DEF_ICON(OBJECT_DATAMODE)	// XXX fix this up
 DEF_ICON(EDITMODE_HLT)
-DEF_ICON(UV)
+DEF_ICON(UV_DATA)
 DEF_ICON(VPAINT_HLT)
 DEF_ICON(TPAINT_HLT)
 DEF_ICON(WPAINT_HLT)
@@ -294,7 +294,7 @@ DEF_ICON(DECORATE_UNLOCKED)
 DEF_ICON(DECORATE_LOCKED)
 DEF_ICON(DECORATE_OVERRIDE)
 DEF_ICON_BLANK(111)
-DEF_ICON(SEALED)
+DEF_ICON(TRACKER_DATA)
 DEF_ICON(HEART)
 DEF_ICON(ORPHAN_DATA)
 DEF_ICON(USER)
@@ -526,7 +526,7 @@ DEF_ICON_BLANK(525)
 DEF_ICON_BLANK(526)
 
 	/* MODIFIERS */
-DEF_ICON_MODIFIER(MODIFIER)
+DEF_ICON_MODIFIER(MODIFIER_DATA)
 DEF_ICON_MODIFIER(MOD_WAVE)
 DEF_ICON_MODIFIER(MOD_BUILD)
 DEF_ICON_MODIFIER(MOD_DECIM)
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index f371bae77c0..24a12950bad 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1894,7 +1894,7 @@ int UI_idcode_icon_get(const int idcode)
 		case ID_MB:
 			return ICON_META_DATA;
 		case ID_MC:
-			return ICON_CLIP;
+			return ICON_TRACKER;
 		case ID_ME:
 			return ICON_MESH_DATA;
 		case ID_MSK:
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index d1261ed5c7e..0d3aa43cd56 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -4581,7 +4581,7 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
 		if (WM_jobs_test(wm, sa, WM_JOB_TYPE_ANY))
 			owner = sa;
 		handle_event = B_STOPCLIP;
-		icon = ICON_CLIP;
+		icon = ICON_TRACKER;
 	}
 	else if (sa->spacetype == SPACE_FILE) {
 		if (WM_jobs_test(wm, sa, WM_JOB_TYPE_FILESEL_READDIR)) {
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 75ad18da3b9..2df7df9ac43 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -891,7 +891,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
 				data.icon = ICON_CONSTRAINT;
 				break;
 			case TSE_MODIFIER_BASE:
-				data.icon = ICON_MODIFIER;
+				data.icon = ICON_MODIFIER_DATA;
 				break;
 			case TSE_LINKED_OB:
 				data.icon = ICON_OBJECT_DATA;
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 2221c63d6b7..dbf436bd4bc 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -70,7 +70,7 @@ const EnumPropertyItem rna_enum_id_type_items[] = {
 	{ID_MA, "MATERIAL", ICON_MATERIAL_DATA, "Material", ""},
 	{ID_MB, "META", ICON_META_DATA, "Metaball", ""},
 	{ID_ME, "MESH", ICON_MESH_DATA, "Mesh", ""},
-	{ID_MC, "MOVIECLIP", ICON_CLIP, "Movie Clip", ""},
+	{ID_MC, "MOVIECLIP", ICON_TRACKER, "Movie Clip", ""},
 	{ID_NT, "NODETREE", ICON_NODETREE, "Node Tree", ""},
 	{ID_OB, "OBJECT", ICON_OBJECT_DATA, "Object", ""},
 	{ID_PC, "PAINTCURVE", ICON_CURVE_BEZCURVE, "Paint Curve", ""},
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c
index 8728f0634da..6a9d547042b 100644
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -396,7 +396,7 @@ static void rna_def_dopesheet(BlenderRNA *brna)
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMODIFIERS);
 	RNA_def_property_ui_text(prop, "Display Modifier Data",
 	                         "Include visualization of animation data related to data-blocks linked to modifiers");
-	RNA_def_property_ui_icon(prop, ICON_MODIFIER, 0);
+	RNA_def_property_ui_icon(prop, ICON_MODIFIER_DATA, 0);
 	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
 
 	prop = RNA_def_property(srna, "show_meshes", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 6dc1b0c32e7..3bddb46d644 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -75,7 +75,7 @@ const EnumPropertyItem rna_enum_space_type_items[] = {
 	{SPACE_IMAGE, "IMAGE_EDITOR", ICON_IMAGE, "UV/Image Editor", "View and edit images and UV Maps"},
 	{SPACE_NODE, "NODE_EDITOR", ICON_NODETREE, "Node Editor", "Editor for node-based shading and compositing tools"},
 	{SPACE_SEQ, "SEQUENCE_EDITOR", ICON_SEQUENCE, "Video Sequencer", "Video editing tools"},
-	{SPACE_CLIP, "CLIP_EDITOR", ICON_CLIP, "Movie Clip Editor", "Motion tracking tools"},
+	{SPACE_CLIP, "CLIP_EDITOR", ICON_TRACKER, "Movie Clip Editor", "Motion tracking tools"},
 
 	/* Animation */
 	{0, "", ICON_NONE, "Animation", ""},
@@ -171,7 +171,7 @@ const EnumPropertyItem rna_enum_space_action_mode_items[] = {
 #define SI_ITEM_VIEW(name, icon) \
 	{SI_MODE_VIEW, "VIEW", icon, name, "View the image"}
 #define SI_ITEM_UV \
-	{SI_MODE_UV, "UV", ICON_GROUP_UVS, "UV Editor", "UV edit in mesh editmode"}
+	{SI_MODE_UV, "UV", ICON_UV, "UV Editor", "UV edit in mesh editmode"}
 #define SI_ITEM_PAINT \
 	{SI_MODE_PAINT, "PAINT", ICON_TPAINT_HLT, "Paint", "2D image painting mode"}
 #define SI_ITEM_MASK \
@@ -4379,7 +4379,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna)
 		{FILTER_ID_LT, "LATTICE", ICON_LATTICE_DATA, "Lattices", "Show/hide Lattice data-blocks"},
 		{FILTER_ID_MA, "MATERIAL", ICON_MATERIAL_DATA, "Materials", "Show/hide Material data-blocks"},
 		{FILTER_ID_MB, "METABALL", ICON_META_DATA, "Metaballs", "Show/hide Metaball data-blocks"},
-		{FILTER_ID_MC, "MOVIE_CLIP", ICON_CLIP, "Movie Clips", "Show/hide Movie Clip data-blocks"},
+		{FILTER_ID_MC, "MOVIE_CLIP", ICON_TRACKER_DATA, "Movie Clips", "Show/hide Movie Clip data-blocks"},
 		{FILTER_ID_ME, "MESH", ICON_MESH_DATA, "Meshes", "Show/hide Mesh data-blocks"},
 		{FILTER_ID_MSK, "MASK", ICON_MOD_MASK, "Masks", "Show/hide Mask data-blocks"},
 		{FILTER_ID_NT, "NODE_TREE", ICON_NODETREE, "Node Trees", "Show/hide Node Tree data-blocks"},
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index c39e1479e31..def5a04f0cf 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -3206,7 +3206,7 @@ static void rna_def_userdef_themes(BlenderRNA *brna)
 		{15, "INFO", ICON_INFO, "Info", ""},
 		{16, "FILE_BROWSER", ICON_FILEBROWSER, "File Browser", ""},
 		{17, "CONSOLE", ICON_CONSOLE, "Python Console", ""},
-		{20, "CLIP_EDITOR", ICON_CLIP, "Movie Clip Editor", ""},
+		{20, "CLIP_EDITOR", ICON_TRACKER, "Movie Clip Editor", ""},
 		{21, "TOPBAR", ICON_NONE, "Top Bar", ""},
 		{22, "STATUSBAR", ICON_NONE, "Status Bar", ""},
 		{0, NULL, 0, NULL, NULL}