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

Campbell Barton noreply at git.blender.org
Wed Mar 7 15:57:45 CET 2018


Commit: d59627d3614b91aea70492b6e00f50b69f25bd68
Author: Campbell Barton
Date:   Thu Mar 8 02:03:36 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBd59627d3614b91aea70492b6e00f50b69f25bd68

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/mesh/editmesh_select.c
index 7b88b091672,1e2c93389ed..1d732f74b8d
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@@ -2852,8 -2820,8 +2852,8 @@@ static int edbm_select_linked_pick_invo
  	vc.mval[1] = event->mval[1];
  
  	/* return warning! */
 -	if (unified_findnearest(&vc, &eve, &eed, &efa) == 0) {
 +	if (unified_findnearest(&eval_ctx, &vc, &eve, &eed, &efa) == 0) {
- 		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit);
+ 		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
  
  		return OPERATOR_CANCELLED;
  	}



More information about the Bf-blender-cvs mailing list