Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Fri, 21 Apr 2017 12:19:05 +0000 (14:19 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Fri, 21 Apr 2017 12:19:05 +0000 (14:19 +0200)
commit81011679ddb1fc57e37fe1ba2eb494a1dedaa0fd
tree54dc7feaf7fbcfbb45891a61bef5113af508696a
parentbfa888cef28955501195dfbee002bc793685e527
parent9c02990ac13a25968d8ec15da15129617d3f25d0
Merge branch 'master' into blender2.8
CMakeLists.txt
build_files/cmake/macros.cmake
source/blender/alembic/intern/abc_mesh.cc
source/blender/alembic/intern/abc_object.cc
source/blender/alembic/intern/alembic_capi.cc
source/blender/blenkernel/intern/cachefile.c
source/blender/blenlib/intern/math_vector.c
source/blenderplayer/CMakeLists.txt
tests/python/bl_alembic_import_test.py