Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Fri, 28 Apr 2017 13:52:07 +0000 (15:52 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Fri, 28 Apr 2017 13:52:07 +0000 (15:52 +0200)
commit074c5f0d26b20fbb69e558af3e9a6f4183a2ad29
treec724af247c52754db1c8426c2ded278859a8b35c
parent08142dde2c87b14da505c126350bb49054cf054f
parentaa88796a6cb6cb65b87508d87c51f1d58234f2ee
Merge branch 'master' into blender2.8
source/blender/alembic/intern/abc_mesh.cc
source/blender/alembic/intern/abc_object.cc
source/blender/alembic/intern/alembic_capi.cc
source/creator/creator_args.c
tests/python/CMakeLists.txt