Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 23 Jan 2018 00:24:44 +0000 (11:24 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 23 Jan 2018 00:24:44 +0000 (11:24 +1100)
commit367e61117907bb7507935251ecb7e396a4c91cbc
treeb9b7b6c4582982f5538e8d88836432bd8ff442f0
parentfb8c382fa17fb0b49cc0f5fae168e7b14bc3aa63
parentfb4582134ae1ebedc68f3c4a4bf2f196503e142c
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_view.c