Merge branch 'blender-v2.83-release'
This commit is contained in:
commit
c2bf0c1d54
|
@ -2335,6 +2335,8 @@ void EDBM_selectmode_convert(BMEditMesh *em,
|
|||
BM_edge_select_set(bm, eed, false);
|
||||
}
|
||||
}
|
||||
/* Deselect faces without edges selected. */
|
||||
BM_mesh_deselect_flush(bm);
|
||||
}
|
||||
else if (selectmode_new == SCE_SELECT_VERTEX) {
|
||||
/* flush down (face -> vert) */
|
||||
|
|
|
@ -138,10 +138,11 @@ void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C)
|
|||
if (obedit && (obedit->type == OB_MESH)) {
|
||||
BMEditMesh *em = BKE_editmesh_from_object(obedit);
|
||||
uiLayout *row;
|
||||
uiBut *but;
|
||||
|
||||
row = uiLayoutRow(layout, true);
|
||||
block = uiLayoutGetBlock(row);
|
||||
uiDefIconButBitS(
|
||||
but = uiDefIconButBitS(
|
||||
block,
|
||||
UI_BTYPE_TOGGLE,
|
||||
SCE_SELECT_VERTEX,
|
||||
|
@ -157,23 +158,26 @@ void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C)
|
|||
0,
|
||||
0,
|
||||
TIP_("Vertex select - Shift-Click for multiple modes, Ctrl-Click contracts selection"));
|
||||
uiDefIconButBitS(block,
|
||||
UI_BTYPE_TOGGLE,
|
||||
SCE_SELECT_EDGE,
|
||||
B_SEL_EDGE,
|
||||
ICON_EDGESEL,
|
||||
0,
|
||||
0,
|
||||
ceilf(UI_UNIT_X - U.pixelsize),
|
||||
UI_UNIT_Y,
|
||||
&em->selectmode,
|
||||
1.0,
|
||||
0.0,
|
||||
0,
|
||||
0,
|
||||
TIP_("Edge select - Shift-Click for multiple modes, Ctrl-Click "
|
||||
"expands/contracts selection"));
|
||||
uiDefIconButBitS(
|
||||
UI_but_flag_disable(but, UI_BUT_UNDO);
|
||||
but = uiDefIconButBitS(
|
||||
block,
|
||||
UI_BTYPE_TOGGLE,
|
||||
SCE_SELECT_EDGE,
|
||||
B_SEL_EDGE,
|
||||
ICON_EDGESEL,
|
||||
0,
|
||||
0,
|
||||
ceilf(UI_UNIT_X - U.pixelsize),
|
||||
UI_UNIT_Y,
|
||||
&em->selectmode,
|
||||
1.0,
|
||||
0.0,
|
||||
0,
|
||||
0,
|
||||
TIP_("Edge select - Shift-Click for multiple modes, "
|
||||
"Ctrl-Click expands/contracts selection depending on the current mode"));
|
||||
UI_but_flag_disable(but, UI_BUT_UNDO);
|
||||
but = uiDefIconButBitS(
|
||||
block,
|
||||
UI_BTYPE_TOGGLE,
|
||||
SCE_SELECT_FACE,
|
||||
|
@ -189,6 +193,7 @@ void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C)
|
|||
0,
|
||||
0,
|
||||
TIP_("Face select - Shift-Click for multiple modes, Ctrl-Click expands selection"));
|
||||
UI_but_flag_disable(but, UI_BUT_UNDO);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue