Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 9 Mar 2017 19:16:15 +0000 (06:16 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 9 Mar 2017 19:58:29 +0000 (06:58 +1100)
commit55a56a31a03ffba115c326c1061762434a72a690
treef4c3952d5c0f1123047d275adb602d0c902bcb5c
parent711ac904816cb4d5e19ed9302b6c99b5aa4eaddd
parent62cc226101fab61b5ae2f18f8cbe8f1e5ac6ce82
Merge branch 'master' into blender2.8

Manually merged viewport xray changes
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw_legacy.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_view.c