diff options
author | Campbell Barton <campbell@blender.org> | 2022-03-22 04:07:00 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-03-22 04:07:00 +0300 |
commit | 4046f61b39c6ba7f12a2df888ada2ecbd52cac76 (patch) | |
tree | 3bda4ea27f1a6d7055bfe85e894917cc5d1c488a | |
parent | 4e1e057cedff97aa8f31bf1b14bd582ca75df055 (diff) |
Fix pose-bone menu selecting before activating the menu
Regression in 1d88aeb95fc40771be7ef3a835af4206c845aa9b.
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 37c9532d60b..9dc5c9ea319 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -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); |