Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 16:26:50 +0000 (18:26 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 16:26:50 +0000 (18:26 +0200)
commit9b9b943e0c7fb5c921a54521c4a7c55f7a7f22ba
treebe92f33358c8930902c708ce213e6a7fbeb7692f
parenta76cfe2c22ed5142a481d89bf85e4b620604ae50
parent27882024176a3015e36305d19a763571e1a8c731
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/BKE_anim.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/armature/pose_edit.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/armature/pose_utils.c
source/blender/editors/include/ED_armature.h
source/blender/editors/object/object_edit.c
source/blender/editors/transform/transform_conversions.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/armature/pose_utils.c