Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Tue, 5 Dec 2017 13:19:47 +0000 (11:19 -0200)
committerGermano <germano.costa@ig.com.br>
Tue, 5 Dec 2017 13:19:47 +0000 (11:19 -0200)
commit6734bb1faf3a4c5c2446ecc4d2261f0d2ea9a39b
tree6cc83f565c6cff4e27ee4d3a46a0d57ecbe083e9
parentdeaeee8e4d92cfd43e641db6a86273e70a4dae7d
parent70c2d8a1a2b8b1e8c1f60f30451dbad88fba7188
Merge branch 'master' into blender2.8

# Conflicts:
# source/blender/editors/mesh/editmesh_select.c
release/scripts/startup/bl_ui/properties_data_bone.py
source/blender/blenkernel/BKE_animsys.h
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/mesh/editmesh_select.c
source/blender/makesrna/intern/rna_armature.c