Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Fri, 3 Mar 2017 11:55:35 +0000 (12:55 +0100)
committerJulian Eisel <eiseljulian@gmail.com>
Fri, 3 Mar 2017 11:55:35 +0000 (12:55 +0100)
commit2a82162618f7b8325a59fe42336b2a5f215e7080
treebd79cd69f936ace1acf7269a19efbfbbc37689a0
parent22df0b2fe2998d51b6ca612867a995f848345f8d
parentc0d0ef142fce15b839c369e9f7413c36b72aa8cb
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/armature/pose_select.c
source/blender/editors/include/ED_armature.h
source/blender/blenkernel/intern/library_remap.c
source/blender/editors/armature/armature_intern.h
source/blender/editors/armature/armature_select.c
source/blender/editors/armature/pose_select.c
source/blender/editors/include/ED_armature.h
source/blender/editors/sculpt_paint/paint_image_proj.c