Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-01-18 19:31:33 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-01-18 19:31:33 +0300
commitd11dd115d7875b3d94628171d083498848f707d6 (patch)
tree13932604aa6a49b08a753237a0266af64f5894e5
parentb8a13162cfcd66c9bf0a046c162326731edb80ea (diff)
fix from 2.5x r26079
-rw-r--r--source/blender/src/vpaint.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/src/vpaint.c b/source/blender/src/vpaint.c
index 2b4c4b33ddf..cb6a09799c9 100644
--- a/source/blender/src/vpaint.c
+++ b/source/blender/src/vpaint.c
@@ -1125,16 +1125,17 @@ void weight_paint(void)
if(ob->actdef<=0) {
Object *modob;
if((modob = modifiers_isDeformedByArmature(ob))) {
+ bArmature *arm= modob->data;
bPoseChannel *pchan;
for(pchan= modob->pose->chanbase.first; pchan; pchan= pchan->next)
- if(pchan->bone->flag & SELECT)
+ if((pchan->bone->flag & SELECT) && (pchan->bone->layer & arm->layer))
break;
if(pchan) {
bDeformGroup *dg= get_named_vertexgroup(ob, pchan->name);
if(dg==NULL)
dg= add_defgroup_name(ob, pchan->name); /* sets actdef */
else
- ob->actdef= get_defgroup_num(ob, dg);
+ ob->actdef= 1 + get_defgroup_num(ob, dg);
allqueue(REDRAWBUTSEDIT, 0);
}
}