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)
1  2 
intern/cycles/blender/blender_sync.cpp
source/blender/makesrna/intern/rna_scene.c
tests/python/bl_alembic_import_test.py