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)
commita6c60affffc99270e94a123092d8b9c0942cccaa
tree19125fb8d6ecab8166d7773de57b341fbbc842d4
parent60a099fb0958c1c0dd16f2800da6cac551e35c2c
parentd252ac6b9528d60b1235e095888f91e202ac4399
Merge branch 'master' into blender2.8
CMakeLists.txt
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_mesh.cc
source/blender/blenkernel/intern/DerivedMesh.c