blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix pose-bone menu selecting before activating the menu 

Regression in 1d88aeb95f.
This commit is contained in:
Campbell Barton 2022-03-22 12:07:00 +11:00
parent 4e1e057ced
commit 4046f61b39
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2477,7 +2477,7 @@ static bool ed_object_select_pick(bContext *C,
/* NOTE: shift+alt goes to group-flush-selecting. */
if (enumerate) {
if (has_bones && bone_mouse_select_menu(C, buffer, hits, false, params)) {
basact = NULL;
handled = true;
}
else {
basact = object_mouse_select_menu(C, &vc, buffer, hits, mval, params);
@ -2489,9 +2489,10 @@ static bool ed_object_select_pick(bContext *C,
}
}
if (((hits > 0) && has_bones) ||
/* Special case, even when there are no hits, pose logic may de-select all bones. */
((hits == 0) && is_pose_mode)) {
if ((handled == false) &&
(((hits > 0) && has_bones) ||
/* Special case, even when there are no hits, pose logic may de-select all bones. */
((hits == 0) && is_pose_mode))) {
if (basact && (has_bones && (basact->object->type == OB_CAMERA))) {
MovieClip *clip = BKE_object_movieclip_get(scene, basact->object, false);