[Bf-blender-cvs] [4046f61b39c] master: Fix pose-bone menu selecting before activating the menu
Campbell Barton
noreply at git.blender.org
Tue Mar 22 03:44:09 CET 2022
Commit: 4046f61b39c6ba7f12a2df888ada2ecbd52cac76
Author: Campbell Barton
Date: Tue Mar 22 12:07:00 2022 +1100
Branches: master
https://developer.blender.org/rB4046f61b39c6ba7f12a2df888ada2ecbd52cac76
Fix pose-bone menu selecting before activating the menu
Regression in 1d88aeb95fc40771be7ef3a835af4206c845aa9b.
===================================================================
M source/blender/editors/space_view3d/view3d_select.c
===================================================================
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);
More information about the Bf-blender-cvs
mailing list