Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 9 Jun 2016 19:46:29 +0000 (05:46 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 9 Jun 2016 19:46:29 +0000 (05:46 +1000)
1  2 
source/blender/editors/space_view3d/drawobject.c
source/blender/gpu/intern/gpu_draw.c

Simple merge