Commit: 55939bf21936c6bef5c350fbf679c08a7c57ea88 Author: Campbell Barton Date: Mon Apr 16 07:27:53 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB55939bf21936c6bef5c350fbf679c08a7c57ea88
Merge branch 'master' into blender2.8 =================================================================== =================================================================== diff --cc source/blender/editors/space_view3d/view3d_select.c index 71ec7bf700c,d184081b03a..c38bcbcd645 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@@ -1899,21 -1911,18 +1899,20 @@@ static int do_meta_box_select return OPERATOR_FINISHED; } -static int do_armature_box_select(ViewContext *vc, rcti *rect, bool select, bool extend) +static int do_armature_box_select( + const struct EvaluationContext *eval_ctx, ViewContext *vc, + const rcti *rect, bool select, bool extend) { bArmature *arm = vc->obedit->data; - EditBone *ebone; int a; unsigned int buffer[MAXPICKBUF]; int hits; - hits = view3d_opengl_select(vc, buffer, MAXPICKBUF, rect, VIEW3D_SELECT_ALL); + hits = view3d_opengl_select(eval_ctx, vc, buffer, MAXPICKBUF, rect, VIEW3D_SELECT_ALL); /* clear flag we use to detect point was affected */ - for (ebone = arm->edbo->first; ebone; ebone = ebone->next) + for (EditBone *ebone = arm->edbo->first; ebone; ebone = ebone->next) ebone->flag &= ~BONE_DONE; if (extend == false && select) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs