From b0dbdc8ad9c8366215bca1c3750ebe01eadccfdf Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Mon, 16 Oct 2023 16:20:12 -0700 Subject: [PATCH 1/3] UI: UVProject Modifier UV Map Icon In the UVProject Modifier change the UV Map icon from a dot to ICON_GROUP_UVS. --- source/blender/modifiers/intern/MOD_uvproject.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/modifiers/intern/MOD_uvproject.cc b/source/blender/modifiers/intern/MOD_uvproject.cc index ccf23741e5b..aea82b04142 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.cc +++ b/source/blender/modifiers/intern/MOD_uvproject.cc @@ -296,7 +296,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetPropSep(layout, true); - uiItemPointerR(layout, ptr, "uv_layer", &obj_data_ptr, "uv_layers", nullptr, ICON_NONE); + uiItemPointerR(layout, ptr, "uv_layer", &obj_data_ptr, "uv_layers", nullptr, ICON_GROUP_UVS); /* Aspect and Scale are only used for camera projectors. */ bool has_camera = false; -- 2.30.2 From e0048de72b4df4f19a1566fbe5b0ccc30cadac17 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Tue, 17 Oct 2023 11:45:47 -0700 Subject: [PATCH 2/3] More missing modifier icons --- source/blender/modifiers/intern/MOD_displace.cc | 2 +- source/blender/modifiers/intern/MOD_explode.cc | 2 +- source/blender/modifiers/intern/MOD_ui_common.cc | 2 +- source/blender/modifiers/intern/MOD_uvwarp.cc | 6 +++--- source/blender/modifiers/intern/MOD_warp.cc | 8 +++++--- source/blender/modifiers/intern/MOD_wave.cc | 2 +- source/blender/modifiers/intern/MOD_weightvgedit.cc | 2 +- source/blender/modifiers/intern/MOD_weightvgproximity.cc | 3 ++- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/source/blender/modifiers/intern/MOD_displace.cc b/source/blender/modifiers/intern/MOD_displace.cc index def32e3bb30..2fda0e8fc7a 100644 --- a/source/blender/modifiers/intern/MOD_displace.cc +++ b/source/blender/modifiers/intern/MOD_displace.cc @@ -414,7 +414,7 @@ static void panel_draw(const bContext *C, Panel *panel) } } else if (texture_coords == MOD_DISP_MAP_UV && RNA_enum_get(&ob_ptr, "type") == OB_MESH) { - uiItemPointerR(col, ptr, "uv_layer", &obj_data_ptr, "uv_layers", nullptr, ICON_NONE); + uiItemPointerR(col, ptr, "uv_layer", &obj_data_ptr, "uv_layers", nullptr, ICON_GROUP_UVS); } uiItemS(layout); diff --git a/source/blender/modifiers/intern/MOD_explode.cc b/source/blender/modifiers/intern/MOD_explode.cc index be015b8e56c..48aeb52548c 100644 --- a/source/blender/modifiers/intern/MOD_explode.cc +++ b/source/blender/modifiers/intern/MOD_explode.cc @@ -1179,7 +1179,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetPropSep(layout, true); - uiItemPointerR(layout, ptr, "particle_uv", &obj_data_ptr, "uv_layers", nullptr, ICON_NONE); + uiItemPointerR(layout, ptr, "particle_uv", &obj_data_ptr, "uv_layers", nullptr, ICON_GROUP_UVS); row = uiLayoutRowWithHeading(layout, true, IFACE_("Show")); uiItemR(row, ptr, "show_alive", toggles_flag, nullptr, ICON_NONE); diff --git a/source/blender/modifiers/intern/MOD_ui_common.cc b/source/blender/modifiers/intern/MOD_ui_common.cc index 8778099e56c..af7e9f33d7b 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.cc +++ b/source/blender/modifiers/intern/MOD_ui_common.cc @@ -134,7 +134,7 @@ void modifier_vgroup_ui(uiLayout *layout, bool has_vertex_group = RNA_string_length(ptr, vgroup_prop) != 0; uiLayout *row = uiLayoutRow(layout, true); - uiItemPointerR(row, ptr, vgroup_prop, ob_ptr, "vertex_groups", text, ICON_NONE); + uiItemPointerR(row, ptr, vgroup_prop, ob_ptr, "vertex_groups", text, ICON_GROUP_VERTEX); if (invert_vgroup_prop != nullptr) { uiLayout *sub = uiLayoutRow(row, true); uiLayoutSetActive(sub, has_vertex_group); diff --git a/source/blender/modifiers/intern/MOD_uvwarp.cc b/source/blender/modifiers/intern/MOD_uvwarp.cc index 5cb57d0b956..35d608ee12b 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.cc +++ b/source/blender/modifiers/intern/MOD_uvwarp.cc @@ -254,7 +254,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetPropSep(layout, true); - uiItemPointerR(layout, ptr, "uv_layer", &obj_data_ptr, "uv_layers", nullptr, ICON_NONE); + uiItemPointerR(layout, ptr, "uv_layer", &obj_data_ptr, "uv_layers", nullptr, ICON_GROUP_UVS); col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "center", UI_ITEM_NONE, nullptr, ICON_NONE); @@ -268,14 +268,14 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) warp_obj_ptr = RNA_pointer_get(ptr, "object_from"); if (!RNA_pointer_is_null(&warp_obj_ptr) && RNA_enum_get(&warp_obj_ptr, "type") == OB_ARMATURE) { PointerRNA warp_obj_data_ptr = RNA_pointer_get(&warp_obj_ptr, "data"); - uiItemPointerR(col, ptr, "bone_from", &warp_obj_data_ptr, "bones", nullptr, ICON_NONE); + uiItemPointerR(col, ptr, "bone_from", &warp_obj_data_ptr, "bones", nullptr, ICON_GROUP_BONE); } uiItemR(col, ptr, "object_to", UI_ITEM_NONE, IFACE_("To"), ICON_NONE); warp_obj_ptr = RNA_pointer_get(ptr, "object_to"); if (!RNA_pointer_is_null(&warp_obj_ptr) && RNA_enum_get(&warp_obj_ptr, "type") == OB_ARMATURE) { PointerRNA warp_obj_data_ptr = RNA_pointer_get(&warp_obj_ptr, "data"); - uiItemPointerR(col, ptr, "bone_to", &warp_obj_data_ptr, "bones", nullptr, ICON_NONE); + uiItemPointerR(col, ptr, "bone_to", &warp_obj_data_ptr, "bones", nullptr, ICON_GROUP_BONE); } modifier_vgroup_ui(layout, ptr, &ob_ptr, "vertex_group", "invert_vertex_group", nullptr); diff --git a/source/blender/modifiers/intern/MOD_warp.cc b/source/blender/modifiers/intern/MOD_warp.cc index 1d6053f3fd6..c620240ffea 100644 --- a/source/blender/modifiers/intern/MOD_warp.cc +++ b/source/blender/modifiers/intern/MOD_warp.cc @@ -361,7 +361,8 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) if (!RNA_pointer_is_null(&from_obj_ptr) && RNA_enum_get(&from_obj_ptr, "type") == OB_ARMATURE) { PointerRNA from_obj_data_ptr = RNA_pointer_get(&from_obj_ptr, "data"); - uiItemPointerR(col, ptr, "bone_from", &from_obj_data_ptr, "bones", IFACE_("Bone"), ICON_NONE); + uiItemPointerR( + col, ptr, "bone_from", &from_obj_data_ptr, "bones", IFACE_("Bone"), ICON_GROUP_BONE); } col = uiLayoutColumn(layout, true); @@ -369,7 +370,8 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) PointerRNA to_obj_ptr = RNA_pointer_get(ptr, "object_to"); if (!RNA_pointer_is_null(&to_obj_ptr) && RNA_enum_get(&to_obj_ptr, "type") == OB_ARMATURE) { PointerRNA to_obj_data_ptr = RNA_pointer_get(&to_obj_ptr, "data"); - uiItemPointerR(col, ptr, "bone_to", &to_obj_data_ptr, "bones", IFACE_("Bone"), ICON_NONE); + uiItemPointerR( + col, ptr, "bone_to", &to_obj_data_ptr, "bones", IFACE_("Bone"), ICON_GROUP_BONE); } uiItemR(layout, ptr, "use_volume_preserve", UI_ITEM_NONE, nullptr, ICON_NONE); @@ -436,7 +438,7 @@ static void texture_panel_draw(const bContext *C, Panel *panel) } else if (texture_coords == MOD_DISP_MAP_UV && RNA_enum_get(&ob_ptr, "type") == OB_MESH) { PointerRNA obj_data_ptr = RNA_pointer_get(&ob_ptr, "data"); - uiItemPointerR(col, ptr, "uv_layer", &obj_data_ptr, "uv_layers", nullptr, ICON_NONE); + uiItemPointerR(col, ptr, "uv_layer", &obj_data_ptr, "uv_layers", nullptr, ICON_GROUP_UVS); } } diff --git a/source/blender/modifiers/intern/MOD_wave.cc b/source/blender/modifiers/intern/MOD_wave.cc index 093c211d545..f9afabb90f1 100644 --- a/source/blender/modifiers/intern/MOD_wave.cc +++ b/source/blender/modifiers/intern/MOD_wave.cc @@ -401,7 +401,7 @@ static void texture_panel_draw(const bContext *C, Panel *panel) } else if (texture_coords == MOD_DISP_MAP_UV && RNA_enum_get(&ob_ptr, "type") == OB_MESH) { PointerRNA obj_data_ptr = RNA_pointer_get(&ob_ptr, "data"); - uiItemPointerR(col, ptr, "uv_layer", &obj_data_ptr, "uv_layers", nullptr, ICON_NONE); + uiItemPointerR(col, ptr, "uv_layer", &obj_data_ptr, "uv_layers", nullptr, ICON_GROUP_UVS); } } diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.cc b/source/blender/modifiers/intern/MOD_weightvgedit.cc index 5ddae895aeb..c96bda0bb55 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.cc +++ b/source/blender/modifiers/intern/MOD_weightvgedit.cc @@ -296,7 +296,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetPropSep(layout, true); col = uiLayoutColumn(layout, true); - uiItemPointerR(col, ptr, "vertex_group", &ob_ptr, "vertex_groups", nullptr, ICON_NONE); + uiItemPointerR(col, ptr, "vertex_group", &ob_ptr, "vertex_groups", nullptr, ICON_GROUP_VERTEX); uiItemR(layout, ptr, "default_weight", UI_ITEM_R_SLIDER, nullptr, ICON_NONE); diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.cc b/source/blender/modifiers/intern/MOD_weightvgproximity.cc index fc22a548068..91661fcd4ff 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.cc +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.cc @@ -652,7 +652,8 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetPropSep(layout, true); - uiItemPointerR(layout, ptr, "vertex_group", &ob_ptr, "vertex_groups", nullptr, ICON_NONE); + uiItemPointerR( + layout, ptr, "vertex_group", &ob_ptr, "vertex_groups", nullptr, ICON_GROUP_VERTEX); uiItemR(layout, ptr, "target", UI_ITEM_NONE, nullptr, ICON_NONE); -- 2.30.2 From 973f2569c198634f47b6529f1669d4d1ccb204a5 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Wed, 18 Oct 2023 08:39:32 -0700 Subject: [PATCH 3/3] ICON_GROUP_BONE -> ICON_BONE_DATA --- source/blender/modifiers/intern/MOD_uvwarp.cc | 4 ++-- source/blender/modifiers/intern/MOD_warp.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/blender/modifiers/intern/MOD_uvwarp.cc b/source/blender/modifiers/intern/MOD_uvwarp.cc index 35d608ee12b..3c3bca5239c 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.cc +++ b/source/blender/modifiers/intern/MOD_uvwarp.cc @@ -268,14 +268,14 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) warp_obj_ptr = RNA_pointer_get(ptr, "object_from"); if (!RNA_pointer_is_null(&warp_obj_ptr) && RNA_enum_get(&warp_obj_ptr, "type") == OB_ARMATURE) { PointerRNA warp_obj_data_ptr = RNA_pointer_get(&warp_obj_ptr, "data"); - uiItemPointerR(col, ptr, "bone_from", &warp_obj_data_ptr, "bones", nullptr, ICON_GROUP_BONE); + uiItemPointerR(col, ptr, "bone_from", &warp_obj_data_ptr, "bones", nullptr, ICON_BONE_DATA); } uiItemR(col, ptr, "object_to", UI_ITEM_NONE, IFACE_("To"), ICON_NONE); warp_obj_ptr = RNA_pointer_get(ptr, "object_to"); if (!RNA_pointer_is_null(&warp_obj_ptr) && RNA_enum_get(&warp_obj_ptr, "type") == OB_ARMATURE) { PointerRNA warp_obj_data_ptr = RNA_pointer_get(&warp_obj_ptr, "data"); - uiItemPointerR(col, ptr, "bone_to", &warp_obj_data_ptr, "bones", nullptr, ICON_GROUP_BONE); + uiItemPointerR(col, ptr, "bone_to", &warp_obj_data_ptr, "bones", nullptr, ICON_BONE_DATA); } modifier_vgroup_ui(layout, ptr, &ob_ptr, "vertex_group", "invert_vertex_group", nullptr); diff --git a/source/blender/modifiers/intern/MOD_warp.cc b/source/blender/modifiers/intern/MOD_warp.cc index c620240ffea..79840dddb77 100644 --- a/source/blender/modifiers/intern/MOD_warp.cc +++ b/source/blender/modifiers/intern/MOD_warp.cc @@ -362,7 +362,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) PointerRNA from_obj_data_ptr = RNA_pointer_get(&from_obj_ptr, "data"); uiItemPointerR( - col, ptr, "bone_from", &from_obj_data_ptr, "bones", IFACE_("Bone"), ICON_GROUP_BONE); + col, ptr, "bone_from", &from_obj_data_ptr, "bones", IFACE_("Bone"), ICON_BONE_DATA); } col = uiLayoutColumn(layout, true); @@ -371,7 +371,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) if (!RNA_pointer_is_null(&to_obj_ptr) && RNA_enum_get(&to_obj_ptr, "type") == OB_ARMATURE) { PointerRNA to_obj_data_ptr = RNA_pointer_get(&to_obj_ptr, "data"); uiItemPointerR( - col, ptr, "bone_to", &to_obj_data_ptr, "bones", IFACE_("Bone"), ICON_GROUP_BONE); + col, ptr, "bone_to", &to_obj_data_ptr, "bones", IFACE_("Bone"), ICON_BONE_DATA); } uiItemR(layout, ptr, "use_volume_preserve", UI_ITEM_NONE, nullptr, ICON_NONE); -- 2.30.2