Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Fri, 7 Apr 2017 15:28:22 +0000 (17:28 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Fri, 7 Apr 2017 15:28:22 +0000 (17:28 +0200)
commit063bae4fcc079d0ba7b7f86d327179df36a95146
treef484ae3d53406ecc01f90189665defb4b1f73b13
parent711ac03fa14a0087d72e2429140357f6748b6972
parent43a910abce50963d12c0ccde596347459d921b9a
Merge branch 'master' into blender2.8

# Conflicts:
# source/blender/alembic/intern/abc_exporter.h
# source/blender/alembic/intern/abc_util.cc
build_files/cmake/macros.cmake
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_exporter.h
source/blender/alembic/intern/abc_object.cc
source/blender/alembic/intern/abc_util.cc
source/blender/alembic/intern/abc_util.h
source/blender/alembic/intern/alembic_capi.cc
source/blender/modifiers/intern/MOD_meshsequencecache.c