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

[Campbell Barton]

Commit: a2758152e2dccb3b016e13a3de2d9e58587866ab
Author: Campbell Barton
Date:   Mon Oct 16 22:28:24 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBa2758152e2dccb3b016e13a3de2d9e58587866ab

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/space_view3d/view3d_edit.c
index b54d1254293,77a3556db0a..bfd7e0b763e
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@@ -3597,7 -3579,7 +3597,6 @@@ static int view3d_zoom_border_exec(bCon
  	ARegion *ar = CTX_wm_region(C);
  	View3D *v3d = CTX_wm_view3d(C);
  	RegionView3D *rv3d = CTX_wm_region_view3d(C);
- 	int gesture_mode;
 -	Scene *scene = CTX_data_scene(C);
  	const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
  
  	/* Zooms in on a border drawn by the user */
diff --cc source/blender/editors/space_view3d/view3d_select.c
index 5ac3aa15d4c,bd19fe8f686..f5d5ae3726f
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@@ -2158,12 -2135,11 +2157,12 @@@ static int view3d_borderselect_exec(bCo
  	view3d_operator_needs_opengl(C);
  
  	/* setup view context for argument to callbacks */
 +	CTX_data_eval_ctx(C, &eval_ctx);
  	view3d_set_viewcontext(C, &vc);
  	
- 	select = (RNA_int_get(op->ptr, "gesture_mode") == GESTURE_MODAL_SELECT);
- 	WM_operator_properties_border_to_rcti(op, &rect);
+ 	select = !RNA_boolean_get(op->ptr, "deselect");
  	extend = RNA_boolean_get(op->ptr, "extend");
+ 	WM_operator_properties_border_to_rcti(op, &rect);
  
  	if (vc.obedit) {
  		switch (vc.obedit->type) {