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)
commit5864269b2c60b150e8ad4244ae6dfccc04f0b44a
treefb11460098269de11de2843ca29e9a61c8fa7bda
parent46e1d85e61aac190e382359d722fafbd533d35ee
parent617c4d6adbfe64b3a72b5c48f918f39d30aa18dc
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_orientations.c