Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 19 Dec 2017 03:15:19 +0000 (14:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 19 Dec 2017 03:15:19 +0000 (14:15 +1100)
commitcfd1b48492e8bd8f747f60f12c3fd624c127b9a3
tree4b581a2667fc68d70422e89bd32c3544d33a6906
parent5df597171bb9065952436027f5a1a271368e51ff
parente418c858ab85a28f312ffc8a3b2f625438558472
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_view.c