Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 28 Jan 2018 05:40:23 +0000 (16:40 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 28 Jan 2018 05:40:23 +0000 (16:40 +1100)
commit1c905046d1da3a37993376f34f9a438244f4a1f3
treef65dff79bcffe2ab6a470a9fb667f1c8b35e58d5
parent87215bbae4cd581229ad1890ed599cebda421b38
parentd386d4e7c4fd256b41dacfd011e9d3082b7654d5
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_utils.c
source/blender/editors/space_view3d/view3d_view.c