Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 23 May 2017 15:35:45 +0000 (17:35 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 23 May 2017 15:35:45 +0000 (17:35 +0200)
commit99c6601a1ffe744ef8592de5da5920156a1097a6
tree2dd91884fb1bc12144f4d585c4591db354725134
parent3db15ae23a542f60926baea24f838c8510371743
parent7b25ffb618dd7509d425f7a5891c64d4a3668743
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_sync.cpp
source/blender/makesrna/intern/rna_scene.c
tests/python/bl_alembic_import_test.py