Commit: 8a6d055f3734c8a0bfeb9b6256d25bfb414634e6 Author: Dalai Felinto Date: Thu Mar 9 17:10:06 2017 +0100 Branches: blender2.8 https://developer.blender.org/rB8a6d055f3734c8a0bfeb9b6256d25bfb414634e6
Merge remote-tracking branch 'origin/master' into blender2.8 =================================================================== =================================================================== diff --cc source/blender/editors/space_view3d/view3d_view.c index 3a28b875f00,e8deaabec7a..bd2071165db --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@@ -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; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs