Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Thu, 9 Mar 2017 16:10:06 +0000 (17:10 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 9 Mar 2017 16:10:06 +0000 (17:10 +0100)
1  2 
source/blender/editors/armature/armature_select.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_text/text_draw.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_view.c

index 3a28b875f008c2ef362cc3f0df7992e933a932fe,e8deaabec7a7baea492eea41b220f2a46ee9a78b..bd2071165db822f72dbc851d12bef3d00aa5b95d
@@@ -1166,10 -1187,9 +1181,10 @@@ void view3d_opengl_select_cache_end(voi
   */
  int view3d_opengl_select(
          ViewContext *vc, unsigned int *buffer, unsigned int bufsize, const rcti *input,
-         int select_mode)
+         eV3DSelectMode select_mode)
  {
        Scene *scene = vc->scene;
 +      SceneLayer *sl = vc->sl;
        View3D *v3d = vc->v3d;
        ARegion *ar = vc->ar;
        rcti rect;