Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 10 Apr 2017 15:34:31 +0000 (17:34 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 10 Apr 2017 15:34:31 +0000 (17:34 +0200)
commit45f3150c98443261a1afb6782133053b35a45ce2
tree5f3234fbbb49db56eca342a515ec046302e8f733
parent5f7011603077511425febf2a7397b2cc7bba1720
parent2ad112437269989439361c23fc9295d642ec11d3
Merge branch 'master' into blender2.8

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