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)
commit4233ccfb6cc0e1fe96987eb757103606f6e3d530
treea1cad57c805358f30807e2a2f26aca0bf4232377
parente5d74954bfe2a7a975c619c02f632df388533a17
parent32edfd53d978b34c9eb528e705f29e3feb673d37
Merge branch 'master' into blender2.8
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