Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 7 Mar 2018 15:03:36 +0000 (02:03 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 7 Mar 2018 15:03:36 +0000 (02:03 +1100)
1  2 
source/blender/editors/mesh/editmesh_select.c

index 7b88b0916720563c91ddcbad326f27fccfe85bc7,1e2c93389ed21b4778190e133830bb53ac6daf10..1d732f74b8d5c190c655cdf0c3bb85c517aeb188
@@@ -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;
        }