Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 5 Jul 2017 07:20:48 +0000 (09:20 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 5 Jul 2017 07:20:48 +0000 (09:20 +0200)
commitf3764d51bd79a5b1eb7ea512817820da9d5150c5
treeb035ac049173d7425bbfe21b3f3298b256d28248
parent84d20dd22756929b7b75000f1498960ae00375e1
parent4d124418b7e471b314a19c142a54b6a6bb0088f0
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/drawobject.c