Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Jun 2016 07:41:22 +0000 (17:41 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Jun 2016 07:41:22 +0000 (17:41 +1000)
commit2cfff95ba315c0650b0be4045dd4adc187bbf65b
treee868af27954144b904084ffbdb8e1b36cb5c393c
parenteedcc4a6a08b21b97146ae00328214987460a223
parente0db647d35cd10675f8ab529f0f5f8e26680973b
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/writefile.c
source/blender/editors/transform/transform_conversions.c