Missed in last merge from master
authorCampbell Barton <ideasman42@gmail.com>
Wed, 27 Sep 2017 21:30:05 +0000 (07:30 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 27 Sep 2017 21:35:06 +0000 (07:35 +1000)
commit64de8c8f0de018f5d2b075db738d7b6322d6d21a
treeff53a72ce9481e477b7fafe60f44b7c774c6845f
parentfcdc7acd8b5963fd4f9fb0a81317c54654d577de
Missed in last merge from master

Local changes built, but merge-commit needed amending.
source/blender/editors/armature/armature_skinning.c
source/blender/editors/include/ED_armature.h
source/blender/editors/object/object_relations.c
source/blender/editors/sculpt_paint/paint_intern.h
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/paint_vertex_proj.c