[Bf-blender-cvs] [09071e27993] master: Fix T75330: Select linked crashes without a bone near the cursor
Campbell Barton
noreply at git.blender.org
Fri Apr 3 04:43:28 CEST 2020
Commit: 09071e27993a6a113ea08376e361230d99e7690d
Author: Campbell Barton
Date: Fri Apr 3 13:19:26 2020 +1100
Branches: master
https://developer.blender.org/rB09071e27993a6a113ea08376e361230d99e7690d
Fix T75330: Select linked crashes without a bone near the cursor
Own error with recent improvements to select link.
===================================================================
M source/blender/editors/armature/armature_select.c
===================================================================
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index 86396dd6783..cafaca1f967 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -290,6 +290,7 @@ void *get_nearest_bone(bContext *C, const int xy[2], bool findunsel, Base **r_ba
bases, bases_len, vc.obedit != NULL, buffer, hits, findunsel, true, r_base);
MEM_freeN(bases);
+
return bone;
}
return NULL;
@@ -484,9 +485,13 @@ static int armature_select_linked_pick_invoke(bContext *C, wmOperator *op, const
Base *base = NULL;
EditBone *ebone_active = get_nearest_bone(C, event->mval, true, &base);
- bArmature *arm = base->object->data;
- if (ebone_active == NULL || !EBONE_SELECTABLE(arm, ebone_active)) {
+ if (ebone_active == NULL) {
+ return OPERATOR_CANCELLED;
+ }
+
+ bArmature *arm = base->object->data;
+ if (!EBONE_SELECTABLE(arm, ebone_active)) {
return OPERATOR_CANCELLED;
}
More information about the Bf-blender-cvs
mailing list