Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Wed, 19 Apr 2017 13:07:54 +0000 (15:07 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Wed, 19 Apr 2017 13:07:54 +0000 (15:07 +0200)
commit781108cdc6095f126ad0c77411d39acb52f11aa0
tree872302d1489cedac077074679351acbf3097e059
parentb01df8222f7d262c7cc08a6e38ab693cad5e27da
parent2dac8b3ee043d9d50e334c7430dc3aee49a3315e
Merge branch 'master' into blender2.8

# Conflicts:
# source/blender/alembic/intern/abc_exporter.cc
# source/blender/alembic/intern/abc_exporter.h
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_exporter.h
source/blender/alembic/intern/alembic_capi.cc
source/blender/makesrna/intern/rna_scene_api.c