From d11dd115d7875b3d94628171d083498848f707d6 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 18 Jan 2010 16:31:33 +0000
Subject: fix from 2.5x r26079

---
 source/blender/src/vpaint.c | 5 +++--
 1 file 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);
 			}
 		}
-- 
cgit v1.2.3