Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 13 Jun 2016 09:26:56 +0000 (19:26 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 13 Jun 2016 09:26:56 +0000 (19:26 +1000)
1  2 
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_orientations.c