Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 28 Feb 2018 02:11:17 +0000 (03:11 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 28 Feb 2018 02:11:17 +0000 (03:11 +0100)
1  2 
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/gpu/intern/gpu_select.c
source/blender/gpu/intern/gpu_select_pick.c
source/blender/gpu/intern/gpu_select_sample_query.c

index 2862ebd9b2f1ec98fa0c5193f36e30b8d27f4206,4e96ea63808274a828f650005099087da3078235..2e6ffb63b78d4a9ed552760785361a199cdcfeaa
@@@ -1222,10 -1235,12 +1222,11 @@@ finally
  }
  
  /* returns basact */
- static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int hits,
-                                       Base *startbase, bool has_bones, bool do_nearest)
+ static Base *mouse_select_eval_buffer(
+         ViewContext *vc, const uint *buffer, int hits,
+         Base *startbase, bool has_bones, bool do_nearest)
  {
 -      Scene *scene = vc->scene;
 -      View3D *v3d = vc->v3d;
 +      ViewLayer *view_layer = vc->view_layer;
        Base *base, *basact = NULL;
        int a;