Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 11 Jul 2017 14:18:17 +0000 (16:18 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 11 Jul 2017 14:18:17 +0000 (16:18 +0200)
1  2 
release/scripts/startup/bl_ui/properties_data_armature.py
source/blender/alembic/intern/abc_object.cc
source/blender/alembic/intern/alembic_capi.cc
source/blender/editors/armature/pose_lib.c
source/blender/makesrna/intern/rna_fcurve.c
source/blender/makesrna/intern/rna_nla.c
tests/python/bl_alembic_import_test.py