UI: Icons update

New icons from Andrzej Ambroż / jendrzych:

  - New icons for select tool modes
  - Brought back screen icon for viewport visibility toggles
  - Added new Instanced visibility toggle (unused currently - meant for forthcoming updates to the Outliner)
  - New Gizmo icon for the header
  - Many tweaks and alterations to existing icons. Full list on Devtalk
  - Use correct icon when Proportional Editing is disabled

5 files changed, 20 insertions, 20 deletions

diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index b4d345a3344..e86170f717e 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -320,7 +320,7 @@ DEF_ICON(RESTRICT_SELECT_ON)
 DEF_ICON(RESTRICT_SELECT_OFF)
 DEF_ICON(RESTRICT_RENDER_ON)
 DEF_ICON(RESTRICT_RENDER_OFF)
-DEF_ICON_BLANK(330)
+DEF_ICON(RESTRICT_INSTANCED_OFF)
 
 /* OUTLINER */
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_EMPTY)
@@ -334,7 +334,7 @@ DEF_ICON_OBJECT_DATA(OUTLINER_DATA_ARMATURE)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_FONT)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_SURFACE)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_SPEAKER)
-DEF_ICON_BLANK(344)
+DEF_ICON_OBJECT_DATA(OUTLINER_DATA_LIGHTPROBE)
 DEF_ICON_BLANK(345)
 DEF_ICON_OBJECT_DATA(OUTLINER_DATA_GREASEPENCIL)
 DEF_ICON(GP_SELECT_POINTS)
@@ -348,7 +348,7 @@ DEF_ICON(ONIONSKIN_OFF)
 DEF_ICON(ONIONSKIN_ON)
 DEF_ICON(RESTRICT_VIEW_ON)
 DEF_ICON(RESTRICT_VIEW_OFF)
-DEF_ICON_BLANK(353)
+DEF_ICON(RESTRICT_INSTANCED_ON)
 
 /* PRIMITIVES */
 DEF_ICON(MESH_PLANE)
@@ -456,11 +456,11 @@ DEF_ICON_BLANK(707)
 DEF_ICON_BLANK(708)
 DEF_ICON_BLANK(709)
 DEF_ICON_BLANK(710)
-DEF_ICON_BLANK(711)
-DEF_ICON_BLANK(712)
-DEF_ICON_BLANK(713)
-DEF_ICON_BLANK(714)
-DEF_ICON_BLANK(715)
+DEF_ICON(SELECT_SET)
+DEF_ICON(SELECT_EXTEND)
+DEF_ICON(SELECT_SUBTRACT)
+DEF_ICON(SELECT_INTERSECT)
+DEF_ICON(SELECT_DIFFERENCE)
 
 /* EMPTY */
 DEF_ICON(ALIGN_LEFT)
@@ -708,7 +708,7 @@ DEF_ICON_BLANK(240)
 DEF_ICON_BLANK(241)
 DEF_ICON_BLANK(242)
 DEF_ICON_BLANK(243)
-DEF_ICON_BLANK(244)
+DEF_ICON(GIZMO)
 DEF_ICON(ORIENTATION_CURSOR)
 DEF_ICON(NORMALS_VERTEX)
 DEF_ICON(NORMALS_FACE)
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 7e295f83390..eeca9151224 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -2057,7 +2057,7 @@ int UI_idcode_icon_get(const int idcode)
     case ID_PC:
       return ICON_CURVE_BEZCURVE; /* TODO! this would need its own icon! */
     case ID_LP:
-      return ICON_LIGHTPROBE_CUBEMAP;
+      return ICON_OUTLINER_DATA_LIGHTPROBE;
     case ID_SCE:
       return ICON_SCENE_DATA;
     case ID_SPK:
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index a6ff09ea4d0..f1452d001bc 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2805,7 +2805,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)
   RNA_def_property_boolean_sdna(prop, NULL, "proportional_objects", 0);
   RNA_def_property_ui_text(
       prop, "Proportional Editing Objects", "Proportional editing object mode");
-  RNA_def_property_ui_icon(prop, ICON_PROP_ON, 0);
+  RNA_def_property_ui_icon(prop, ICON_PROP_OFF, 1);
   RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */
 
   prop = RNA_def_property(srna, "use_proportional_projected", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 1e14fd06b4f..bebceaf07e1 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -5146,7 +5146,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna)
        "Show/hide Paint Curve data-blocks"},
       {FILTER_ID_LP,
        "LIGHT_PROBE",
-       ICON_LIGHTPROBE_CUBEMAP,
+       ICON_OUTLINER_DATA_LIGHTPROBE,
        "Light Probes",
        "Show/hide Light Probe data-blocks"},
       {FILTER_ID_SCE, "SCENE", ICON_SCENE_DATA, "Scenes", "Show/hide Scene data-blocks"},
diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c
index ece57f5a63b..735b9484392 100644
--- a/source/blender/windowmanager/intern/wm_operator_props.c
+++ b/source/blender/windowmanager/intern/wm_operator_props.c
@@ -344,11 +344,11 @@ void WM_operator_properties_gesture_box(wmOperatorType *ot)
 void WM_operator_properties_select_operation(wmOperatorType *ot)
 {
   static const EnumPropertyItem select_mode_items[] = {
-      {SEL_OP_SET, "SET", 0, "New", ""},
-      {SEL_OP_ADD, "ADD", 0, "Add", ""},
-      {SEL_OP_SUB, "SUB", 0, "Subtract", ""},
-      {SEL_OP_XOR, "XOR", 0, "Difference", ""},
-      {SEL_OP_AND, "AND", 0, "Intersect", ""},
+      {SEL_OP_SET, "SET", ICON_SELECT_SET, "New", ""},
+      {SEL_OP_ADD, "ADD", ICON_SELECT_EXTEND, "Add", ""},
+      {SEL_OP_SUB, "SUB", ICON_SELECT_SUBTRACT, "Subtract", ""},
+      {SEL_OP_XOR, "XOR", ICON_SELECT_DIFFERENCE, "Difference", ""},
+      {SEL_OP_AND, "AND", ICON_SELECT_INTERSECT, "Intersect", ""},
       {0, NULL, 0, NULL, NULL},
   };
   PropertyRNA *prop = RNA_def_enum(ot->srna, "mode", select_mode_items, SEL_OP_SET, "Mode", "");
@@ -359,9 +359,9 @@ void WM_operator_properties_select_operation(wmOperatorType *ot)
 void WM_operator_properties_select_operation_simple(wmOperatorType *ot)
 {
   static const EnumPropertyItem select_mode_items[] = {
-      {SEL_OP_SET, "SET", 0, "New", ""},
-      {SEL_OP_ADD, "ADD", 0, "Add", ""},
-      {SEL_OP_SUB, "SUB", 0, "Subtract", ""},
+      {SEL_OP_SET, "SET", ICON_SELECT_SET, "New", ""},
+      {SEL_OP_ADD, "ADD", ICON_SELECT_EXTEND, "Add", ""},
+      {SEL_OP_SUB, "SUB", ICON_SELECT_SUBTRACT, "Subtract", ""},
       {0, NULL, 0, NULL, NULL},
   };
   PropertyRNA *prop = RNA_def_enum(ot->srna, "mode", select_mode_items, SEL_OP_SET, "Mode", "");