blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Fix T90718: Object selection toggle do not work inside edit mode 

The object was not deselected as it was expected that it would be
activated.

But this activation does not happen in edit mode.
This commit is contained in:
Germano Cavalcante 2021-08-17 18:25:53 -03:00
parent c0f600cad1
commit 7bffafab7b
Notes: blender-bot 2023-02-13 17:54:40 +01:00 
Referenced by issue #90718, Object selection toggle do not work inside edit mode
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_view3d/view3d_select.c
View File

@ -2521,6 +2521,7 @@ static bool ed_object_select_pick(bContext *C,
}
/* also prevent making it active on mouse selection */
else if (BASE_SELECTABLE(v3d, basact)) {
const bool use_activate_selected_base = (oldbasact != basact) && (is_obedit == false);
if (extend) {
ED_object_base_select(basact, BA_SELECT);
}
@ -2529,7 +2530,8 @@ static bool ed_object_select_pick(bContext *C,
}
else if (toggle) {
if (basact->flag & BASE_SELECTED) {
if (basact == oldbasact) {
/* Keep selected if the base is to be activated. */
if (use_activate_selected_base == false) {
ED_object_base_select(basact, BA_DESELECT);
}
}
@ -2545,7 +2547,7 @@ static bool ed_object_select_pick(bContext *C,
}
}
if ((oldbasact != basact) && (is_obedit == false)) {
if (use_activate_selected_base) {
ED_object_base_activate(C, basact); /* adds notifier */
if ((scene->toolsettings->object_flag & SCE_OBJECT_MODE_LOCK) == 0) {
WM_toolsystem_update_from_context_view3d(C);