Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 24 May 2017 11:16:54 +0000 (21:16 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 24 May 2017 11:17:05 +0000 (21:17 +1000)
1  2 
CMakeLists.txt
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_mesh.cc
source/blender/blenkernel/intern/DerivedMesh.c

diff --cc CMakeLists.txt
Simple merge