Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 6 Apr 2017 02:04:48 +0000 (12:04 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 6 Apr 2017 02:04:48 +0000 (12:04 +1000)
1  2 
source/blender/alembic/intern/abc_util.cc
source/blender/editors/transform/transform_manipulator.c