[Bf-blender-cvs] [ebe33611818] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: ebe336118181ffe6834a2bfd9f6a6c9ac459588a
Author: Campbell Barton
Date:   Sun Apr 15 12:48:39 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBebe336118181ffe6834a2bfd9f6a6c9ac459588a

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/armature/armature_select.c
index 7149fb15f45,ba856d4e964..b147f94747c
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@@ -294,8 -291,8 +294,8 @@@ static int selectbuffer_ret_hits_5(unsi
  /* does bones and points */
  /* note that BONE ROOT only gets drawn for root bones (or without IK) */
  static EditBone *get_nearest_editbonepoint(
-         const EvaluationContext *eval_ctx, ViewContext *vc, const int mval[2],
-         ListBase *edbo, bool findunsel, bool use_cycle, int *r_selmask)
 -        ViewContext *vc,
++        const EvaluationContext *eval_ctx, ViewContext *vc,
+         bool findunsel, bool use_cycle, int *r_selmask)
  {
  	bArmature *arm = (bArmature *)vc->obedit->data;
  	EditBone *ebone_next_act = arm->act_edbone;
@@@ -346,8 -343,8 +346,8 @@@
  	/* we _must_ end cache before return, use 'goto cache_end' */
  	view3d_opengl_select_cache_begin();
  
- 	BLI_rcti_init_pt_radius(&rect, mval, 12);
+ 	BLI_rcti_init_pt_radius(&rect, vc->mval, 12);
 -	hits12 = view3d_opengl_select(vc, buffer, MAXPICKBUF, &rect, select_mode);
 +	hits12 = view3d_opengl_select(eval_ctx, vc, buffer, MAXPICKBUF, &rect, select_mode);
  	if (hits12 == 1) {
  		hits = selectbuffer_ret_hits_12(buffer, hits12);
  		goto cache_end;
@@@ -356,8 -353,8 +356,8 @@@
  		int offs;
  
  		offs = 4 * hits12;
- 		BLI_rcti_init_pt_radius(&rect, mval, 5);
+ 		BLI_rcti_init_pt_radius(&rect, vc->mval, 5);
 -		hits5 = view3d_opengl_select(vc, buffer + offs, MAXPICKBUF - offs, &rect, select_mode);
 +		hits5 = view3d_opengl_select(eval_ctx, vc, buffer + offs, MAXPICKBUF - offs, &rect, select_mode);
  
  		if (hits5 == 1) {
  			hits = selectbuffer_ret_hits_5(buffer, hits12, hits5);
@@@ -484,8 -481,6 +484,7 @@@ static int ebone_select_flag(EditBone *
  bool ED_armature_edit_select_pick(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
  {
  	Object *obedit = CTX_data_edit_object(C);
- 	bArmature *arm = obedit->data;
 +	EvaluationContext eval_ctx;
  	ViewContext vc;
  	EditBone *nearBone = NULL;
  	int selmask;
@@@ -497,8 -493,9 +496,9 @@@
  		return true;
  	}
  
- 	nearBone = get_nearest_editbonepoint(&eval_ctx, &vc, mval, arm->edbo, true, true, &selmask);
 -	nearBone = get_nearest_editbonepoint(&vc, true, true, &selmask);
++	nearBone = get_nearest_editbonepoint(&eval_ctx, &vc, true, true, &selmask);
  	if (nearBone) {
+ 		bArmature *arm = obedit->data;
  
  		if (!extend && !deselect && !toggle) {
  			ED_armature_edit_deselect_all(obedit);