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

[Brecht Van Lommel]

Commit: c0d6627dc5fd069ec31c116e98e1817a0fe20ebb
Author: Brecht Van Lommel
Date:   Wed Feb 28 03:11:17 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBc0d6627dc5fd069ec31c116e98e1817a0fe20ebb

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/space_view3d/view3d_select.c
index 2862ebd9b2f,4e96ea63808..2e6ffb63b78
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@@ -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;