Merge branch 'blender-v2.91-release'
This commit is contained in:
commit
90eab4a25d
|
@ -268,7 +268,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
|
|||
|
||||
modifier_vgroup_ui(layout, ptr, &ob_ptr, "vertex_group", "invert_vertex_group", NULL);
|
||||
|
||||
uiItemO(layout, "Generate Data Layers", ICON_NONE, "OBJECT_OT_datalayout_transfer");
|
||||
uiItemO(layout, IFACE_("Generate Data Layers"), ICON_NONE, "OBJECT_OT_datalayout_transfer");
|
||||
|
||||
modifier_panel_end(layout, ptr);
|
||||
}
|
||||
|
|
|
@ -492,11 +492,11 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
|
|||
|
||||
if (RNA_enum_get(&ob_ptr, "mode") == OB_MODE_EDIT) {
|
||||
row = uiLayoutRow(layout, true);
|
||||
uiItemO(row, "Reset", ICON_NONE, "OBJECT_OT_hook_reset");
|
||||
uiItemO(row, "Recenter", ICON_NONE, "OBJECT_OT_hook_recenter");
|
||||
uiItemO(row, IFACE_("Reset"), ICON_NONE, "OBJECT_OT_hook_reset");
|
||||
uiItemO(row, IFACE_("Recenter"), ICON_NONE, "OBJECT_OT_hook_recenter");
|
||||
row = uiLayoutRow(layout, true);
|
||||
uiItemO(row, "Select", ICON_NONE, "OBJECT_OT_hook_select");
|
||||
uiItemO(row, "Assign", ICON_NONE, "OBJECT_OT_hook_assign");
|
||||
uiItemO(row, IFACE_("Select"), ICON_NONE, "OBJECT_OT_hook_select");
|
||||
uiItemO(row, IFACE_("Assign"), ICON_NONE, "OBJECT_OT_hook_assign");
|
||||
}
|
||||
|
||||
modifier_panel_end(layout, ptr);
|
||||
|
|
|
@ -230,8 +230,9 @@ static void vertex_group_panel_draw(const bContext *UNUSED(C), Panel *panel)
|
|||
uiLayoutSetPropSep(layout, true);
|
||||
|
||||
col = uiLayoutColumn(layout, false);
|
||||
uiItemPointerR(col, ptr, "shell_vertex_group", &ob_ptr, "vertex_groups", "Shell", ICON_NONE);
|
||||
uiItemPointerR(col, ptr, "rim_vertex_group", &ob_ptr, "vertex_groups", "Rim", ICON_NONE);
|
||||
uiItemPointerR(
|
||||
col, ptr, "shell_vertex_group", &ob_ptr, "vertex_groups", IFACE_("Shell"), ICON_NONE);
|
||||
uiItemPointerR(col, ptr, "rim_vertex_group", &ob_ptr, "vertex_groups", IFACE_("Rim"), ICON_NONE);
|
||||
}
|
||||
|
||||
static void panelRegister(ARegionType *region_type)
|
||||
|
|
Loading…
Reference in New Issue