[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26080] branches/blender2.4/source/blender /src/vpaint.c: fix from 2.5x r26079

[Campbell Barton]

Revision: 26080
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26080
Author:   campbellbarton
Date:     2010-01-18 17:31:33 +0100 (Mon, 18 Jan 2010)

Log Message:
-----------
fix from 2.5x r26079

Modified Paths:
--------------
    branches/blender2.4/source/blender/src/vpaint.c

Modified: branches/blender2.4/source/blender/src/vpaint.c
===================================================================
--- branches/blender2.4/source/blender/src/vpaint.c	2010-01-18 16:21:23 UTC (rev 26079)
+++ branches/blender2.4/source/blender/src/vpaint.c	2010-01-18 16:31:33 UTC (rev 26080)
@@ -1125,16 +1125,17 @@
 	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);
 			}
 		}