Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Thu, 20 Apr 2017 10:50:20 +0000 (12:50 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Thu, 20 Apr 2017 10:50:20 +0000 (12:50 +0200)
commitaa4102a441c00dfa321c9627bb8c04c4b350f115
tree0285c49e86ba451509c7a39f4943d8f770b2eadf
parent8e0c57a812e8eb557bddd2d2bb1e6c812cd1e065
parentae79eb2105de519bcc408256d25272efa3195818
Merge branch 'master' into blender2.8

Disabled a unittest, to be re-enabled when T51261 is fixed.

# Conflicts:
# source/blender/alembic/intern/alembic_capi.cc
source/blender/makesrna/intern/rna_access.c
tests/python/bl_alembic_import_test.py