Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 29 Jan 2018 06:32:20 +0000 (17:32 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 29 Jan 2018 06:32:20 +0000 (17:32 +1100)
commitda885b922c1c2aeed8776504bad57e8e3bb2c2e6
tree984b7d27bacae70d728c5d857dd7dc4af7d67fa3
parent045f3bda6434cb15c9f1dab15c669cc22b4d815f
parent79639ccd6b118d14fdf43998032226ebf54a2b3e
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/armature/armature_relations.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c