Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Wed, 9 Aug 2017 13:08:06 +0000 (15:08 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Wed, 9 Aug 2017 13:08:06 +0000 (15:08 +0200)
commit6883f10f141d51cf2427183a85f11fd87a8915ad
tree620f7e5eaa8fdbddd9ef709e699e66ff87237413
parented500ac8c751046c005c2988775bd745252f4939
parent176ad9ecdd4efca4dbe33b9c3a003c16e3706433
Merge branch 'master' into blender2.8
source/blender/alembic/intern/abc_mesh.cc
source/blender/alembic/intern/abc_mesh.h
source/blender/editors/object/object_relations.c
source/blender/modifiers/intern/MOD_meshsequencecache.c
tests/python/bl_alembic_import_test.py