Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 25 Aug 2017 12:22:50 +0000 (22:22 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 25 Aug 2017 12:22:58 +0000 (22:22 +1000)
commit8e6c18a98f5b006f16873d14198b615631dd48ed
tree2b7e1c7bbfae147edc6f4fd7aa204c494045f188
parentf8f6f8f26eaad3b6d89a57df70114cd4fa40dc79
parentde669c3b602fbc81cd015b06c18f2de6414ba749
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_draw_legacy.c
source/blender/editors/space_view3d/view3d_view.c