From a7e80a94708408d99d9c1674ce0738bc60411981 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 27 Feb 2015 11:39:03 +0100 Subject: Fix T43814: Skinning : set parent with automatic weights doesn't take into account locked vertex groups. Simply skip a bone's vgroup when it already exists and is locked. --- source/blender/editors/armature/armature_skinning.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/armature') diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c index 3126cca7457..ea1a94fbba6 100644 --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@ -166,9 +166,15 @@ static int dgroup_skinnable_cb(Object *ob, Bone *bone, void *datap) else segments = 1; - if (!wpmode || ((arm->layer & bone->layer) && (bone->flag & BONE_SELECTED))) - if (!(defgroup = defgroup_find_name(ob, bone->name))) + if (!wpmode || ((arm->layer & bone->layer) && (bone->flag & BONE_SELECTED))) { + if (!(defgroup = defgroup_find_name(ob, bone->name))) { defgroup = BKE_object_defgroup_add_name(ob, bone->name); + } + else if (defgroup->flag & DG_LOCK_WEIGHT) { + /* In case vgroup already exists and is locked, do not modify it here. See T43814. */ + defgroup = NULL; + } + } if (data->list != NULL) { hgroup = (bDeformGroup ***) &data->list; -- cgit v1.2.3