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)
1  2 
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

Simple merge
Simple merge