Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 22 Jan 2018 03:14:33 +0000 (14:14 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 22 Jan 2018 03:14:33 +0000 (14:14 +1100)
commitf7c812e199ed199eb8be2563d6cf0a7062b51e71
treec3cd2dc7463b0deae7ea301018d7dff29d2783e6
parentebbed57bef357c280296cb8d986cb49ef6778d69
parentc723e91ee155612b68950ca2a44b49bdd3c72838
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_view.c