blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 777 Projects 19 Wiki Activity

UI: Modifier Property Icons #113793

Merged
Harley Acheson merged 4 commits from Harley/blender:UVProjectIcon into main 2023-10-18 18:59:20 +02:00
Conversation 4 Commits 4 Files Changed 9 +16 -13
9 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/modifiers/intern/MOD_displace.cc
View File

@ -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);

2
source/blender/modifiers/intern/MOD_explode.cc
View File

@ -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);

2
source/blender/modifiers/intern/MOD_ui_common.cc
View File

@ -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);

2
source/blender/modifiers/intern/MOD_uvproject.cc
View File

@ -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;

6
source/blender/modifiers/intern/MOD_uvwarp.cc
View File

@ -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_BONE_DATA);
Harley marked this conversation as resolved Outdated
Pablo Vazquez commented 2023-10-18 12:20:48 +02:00
Outdated
Review
Copy Link

This and all other uses of GROUP_BONE should be BONE_DATA. Since what the list shows is a single bone, not a group of bones (which are now called Bone Collections).

This and all other uses of `GROUP_BONE` should be `BONE_DATA`. Since what the list shows is a single bone, not a group of bones (which are now called Bone Collections).
}
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_BONE_DATA);
}
modifier_vgroup_ui(layout, ptr, &ob_ptr, "vertex_group", "invert_vertex_group", nullptr);

8
source/blender/modifiers/intern/MOD_warp.cc
View File

@ -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_BONE_DATA);
}
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_BONE_DATA);
}
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);
}
}

2
source/blender/modifiers/intern/MOD_wave.cc
View File

@ -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);
}
}

2
source/blender/modifiers/intern/MOD_weightvgedit.cc
View File

@ -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);

3
source/blender/modifiers/intern/MOD_weightvgproximity.cc
View File

@ -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);