Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Wed, 26 Apr 2017 14:50:29 +0000 (16:50 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Wed, 26 Apr 2017 14:50:29 +0000 (16:50 +0200)
commitdc27d31a2100c3272d0dbf293b24131eacaab962
tree1b5349dbad4e520e0c6b874795ed63211f5f95ed
parent7517cf6bbb989286f9a65b70ceae2e277e111e58
parent6ed15c5a41130b55cb57a43a8a9470a91d38c3d5
Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8

# Conflicts:
# source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_object.cc
source/blender/alembic/intern/alembic_capi.cc
tests/python/bl_alembic_import_test.py