Orange request; Bones in Armature now have own layer settings.

Works like for Object layers, but local within Armature itself. Each Bone
can be in (16 now) any layer, and the Armature layer defines what is
visible or not. Also note that hiding will still work too.

Since the Blender code is *stuffed* with Bone options now, this commit
requires a good test if all tools we got now comply to layers...
(I counted 130 cases for checking for selected Bones in code!)

In PoseMode; hotkey M will show 'movetolayer' menu. Not in editmode...
then its the mirror menu.

Todo: make action/nla drawing comply to Armature layer settings.

1 files changed, 152 insertions, 89 deletions

diff --git a/source/blender/src/poseobject.c b/source/blender/src/poseobject.c
index 5a2276736b6..45cfe9c6eba 100644
--- a/source/blender/src/poseobject.c
+++ b/source/blender/src/poseobject.c
@@ -119,12 +119,13 @@ void enter_posemode(void)
 
 void set_pose_keys (Object *ob)
 {
+	bArmature *arm= ob->data;
 	bPoseChannel *chan;
 
 	if (ob->pose){
 		for (chan=ob->pose->chanbase.first; chan; chan=chan->next){
 			Bone *bone= chan->bone;
-			if(bone && (bone->flag & BONE_SELECTED)) {
+			if(bone && (bone->flag & BONE_SELECTED) && (arm->layer & bone->layer)) {
 				chan->flag |= POSE_KEY;		
 			}
 			else {
@@ -189,6 +190,7 @@ int pose_channel_in_IK_chain(Object *ob, bPoseChannel *pchan)
 /* for the object with pose/action: create path curves for selected bones */
 void pose_calculate_path(Object *ob)
 {
+	bArmature *arm;
 	bPoseChannel *pchan;
 	Base *base;
 	float *fp;
@@ -196,6 +198,7 @@ void pose_calculate_path(Object *ob)
 	
 	if(ob==NULL || ob->pose==NULL)
 		return;
+	arm= ob->data;
 	
 	if(EFRA<=SFRA) return;
 	
@@ -204,10 +207,12 @@ void pose_calculate_path(Object *ob)
 	/* malloc the path blocks */
 	for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
 		if(pchan->bone && (pchan->bone->flag & BONE_SELECTED)) {
-			pchan->pathlen= EFRA-SFRA;
-			if(pchan->path)
-				MEM_freeN(pchan->path);
-			pchan->path= MEM_callocN(3*pchan->pathlen*sizeof(float), "pchan path");
+			if(arm->layer & pchan->bone->layer) {
+				pchan->pathlen= EFRA-SFRA;
+				if(pchan->path)
+					MEM_freeN(pchan->path);
+				pchan->path= MEM_callocN(3*pchan->pathlen*sizeof(float), "pchan path");
+			}
 		}
 	}
 	
@@ -225,10 +230,12 @@ void pose_calculate_path(Object *ob)
 		
 		for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
 			if(pchan->bone && (pchan->bone->flag & BONE_SELECTED)) {
-				if(pchan->path) {
-					fp= pchan->path+3*(CFRA-SFRA);
-					VECCOPY(fp, pchan->pose_tail);
-					Mat4MulVecfl(ob->obmat, fp);
+				if(arm->layer & pchan->bone->layer) {
+					if(pchan->path) {
+						fp= pchan->path+3*(CFRA-SFRA);
+						VECCOPY(fp, pchan->pose_tail);
+						Mat4MulVecfl(ob->obmat, fp);
+					}
 				}
 			}
 		}
@@ -263,6 +270,7 @@ void pose_clear_paths(Object *ob)
 void pose_select_constraint_target(void)
 {
 	Object *ob= OBACT;
+	bArmature *arm= ob->data;
 	bPoseChannel *pchan;
 	bConstraint *con;
 	
@@ -271,16 +279,18 @@ void pose_select_constraint_target(void)
 	if(ob==G.obedit || (ob->flag & OB_POSEMODE)==0) return;
 	
 	for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-		if(pchan->bone->flag & (BONE_ACTIVE|BONE_SELECTED)) {
-			
-			for(con= pchan->constraints.first; con; con= con->next) {
-				char *subtarget;
-				Object *target= get_constraint_target(con, &subtarget);
+		if(arm->layer & pchan->bone->layer) {
+			if(pchan->bone->flag & (BONE_ACTIVE|BONE_SELECTED)) {
 				
-				if(ob==target) {
-					if(subtarget) {
-						bPoseChannel *pchanc= get_pose_channel(ob->pose, subtarget);
-						pchanc->bone->flag |= BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL;
+				for(con= pchan->constraints.first; con; con= con->next) {
+					char *subtarget;
+					Object *target= get_constraint_target(con, &subtarget);
+					
+					if(ob==target) {
+						if(subtarget) {
+							bPoseChannel *pchanc= get_pose_channel(ob->pose, subtarget);
+							pchanc->bone->flag |= BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL;
+						}
 					}
 				}
 			}
@@ -335,6 +345,7 @@ void pose_add_IK(void)
 void pose_clear_IK(void)
 {
 	Object *ob= OBACT;
+	bArmature *arm= ob->data;
 	bPoseChannel *pchan;
 	bConstraint *con;
 	bConstraint *next;
@@ -346,17 +357,19 @@ void pose_clear_IK(void)
 	if(okee("Remove IK constraint(s)")==0) return;
 
 	for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-		if(pchan->bone->flag & (BONE_ACTIVE|BONE_SELECTED)) {
-			
-			for(con= pchan->constraints.first; con; con= next) {
-				next= con->next;
-				if(con->type==CONSTRAINT_TYPE_KINEMATIC) {
-					BLI_remlink(&pchan->constraints, con);
-					free_constraint_data(con);
-					MEM_freeN(con);
+		if(arm->layer & pchan->bone->layer) {
+			if(pchan->bone->flag & (BONE_ACTIVE|BONE_SELECTED)) {
+				
+				for(con= pchan->constraints.first; con; con= next) {
+					next= con->next;
+					if(con->type==CONSTRAINT_TYPE_KINEMATIC) {
+						BLI_remlink(&pchan->constraints, con);
+						free_constraint_data(con);
+						MEM_freeN(con);
+					}
 				}
+				pchan->constflag &= ~(PCHAN_HAS_IK|PCHAN_HAS_TARGET);
 			}
-			pchan->constflag &= ~(PCHAN_HAS_IK|PCHAN_HAS_TARGET);
 		}
 	}
 	
@@ -372,6 +385,7 @@ void pose_clear_IK(void)
 void pose_clear_constraints(void)
 {
 	Object *ob= OBACT;
+	bArmature *arm= ob->data;
 	bPoseChannel *pchan;
 	
 	/* paranoia checks */
@@ -382,9 +396,11 @@ void pose_clear_constraints(void)
 	
 	/* find active */
 	for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-		if(pchan->bone->flag & (BONE_ACTIVE|BONE_SELECTED)) {
-			free_constraints(&pchan->constraints);
-			pchan->constflag= 0;
+		if(arm->layer & pchan->bone->layer) {
+			if(pchan->bone->flag & (BONE_ACTIVE|BONE_SELECTED)) {
+				free_constraints(&pchan->constraints);
+				pchan->constflag= 0;
+			}
 		}
 	}
 	
@@ -402,6 +418,7 @@ void pose_clear_constraints(void)
 void pose_copy_menu(void)
 {
 	Object *ob= OBACT;
+	bArmature *arm= ob->data;
 	bPoseChannel *pchan, *pchanact;
 	short nr;
 	
@@ -420,21 +437,23 @@ void pose_copy_menu(void)
 	nr= pupmenu("Copy Pose Attributes %t|Location%x1|Rotation%x2|Size%x3|Constraints");
 	
 	for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-		if(pchan->bone->flag & BONE_SELECTED) {
-			if(pchan!=pchanact) {
-				if(nr==1) {
-					VECCOPY(pchan->loc, pchanact->loc);
-				}
-				else if(nr==2) {
-					QUATCOPY(pchan->quat, pchanact->quat);
-				}
-				else if(nr==3) {
-					VECCOPY(pchan->size, pchanact->size);
-				}
-				else if(nr==4) {
-					free_constraints(&pchan->constraints);
-					copy_constraints(&pchan->constraints, &pchanact->constraints);
-					pchan->constflag = pchanact->constflag;
+		if(arm->layer & pchan->bone->layer) {
+			if(pchan->bone->flag & BONE_SELECTED) {
+				if(pchan!=pchanact) {
+					if(nr==1) {
+						VECCOPY(pchan->loc, pchanact->loc);
+					}
+					else if(nr==2) {
+						QUATCOPY(pchan->quat, pchanact->quat);
+					}
+					else if(nr==3) {
+						VECCOPY(pchan->size, pchanact->size);
+					}
+					else if(nr==4) {
+						free_constraints(&pchan->constraints);
+						copy_constraints(&pchan->constraints, &pchanact->constraints);
+						pchan->constflag = pchanact->constflag;
+					}
 				}
 			}
 		}
@@ -611,6 +630,7 @@ void pose_adds_vgroups(Object *meshobj)
 	struct vgroup_map map;
 	DerivedMesh *dm;
 	Object *poseobj= modifiers_isDeformedByArmature(meshobj);
+	bArmature *arm= poseobj->data;
 	bPoseChannel *pchan;
 	Bone *bone;
 	bDeformGroup *dg, *curdef;
@@ -624,47 +644,49 @@ void pose_adds_vgroups(Object *meshobj)
 	
 	for(pchan= poseobj->pose->chanbase.first; pchan; pchan= pchan->next) {
 		bone= pchan->bone;
-		if(bone->flag & (BONE_SELECTED)) {
-			
-			/* check if mesh has vgroups */
-			dg= get_named_vertexgroup(meshobj, bone->name);
-			if(dg==NULL)
-				dg= add_defgroup_name(meshobj, bone->name);
-			
-			/* flipped bone */
-			if(Gwp.flag & VP_MIRROR_X) {
-				char name[32];
+		if(arm->layer & pchan->bone->layer) {
+			if(bone->flag & (BONE_SELECTED)) {
 				
-				BLI_strncpy(name, dg->name, 32);
-				bone_flip_name(name, 0);		// 0 = don't strip off number extensions
+				/* check if mesh has vgroups */
+				dg= get_named_vertexgroup(meshobj, bone->name);
+				if(dg==NULL)
+					dg= add_defgroup_name(meshobj, bone->name);
+				
+				/* flipped bone */
+				if(Gwp.flag & VP_MIRROR_X) {
+					char name[32];
+					
+					BLI_strncpy(name, dg->name, 32);
+					bone_flip_name(name, 0);		// 0 = don't strip off number extensions
+					
+					for (curdef = meshobj->defbase.first; curdef; curdef=curdef->next)
+						if (!strcmp(curdef->name, name))
+							break;
+					map.dgflip= curdef;
+				}
+				else map.dgflip= NULL;
+				
+				/* get the root of the bone in global coords */
+				VECCOPY(map.head, bone->arm_head);
+				Mat4MulVecfl(poseobj->obmat, map.head);
+				
+				/* get the tip of the bone in global coords */
+				VECCOPY(map.tail, bone->arm_tail);
+				Mat4MulVecfl(poseobj->obmat, map.tail);
+				
+				/* use the optimal vertices instead of mverts */
+				map.dg= dg;
+				map.bone= bone;
+				if(dm->foreachMappedVert) 
+					dm->foreachMappedVert(dm, pose_adds_vgroups__mapFunc, (void*) &map);
+				else {
+					Mesh *me= meshobj->data;
+					int i;
+					for(i=0; i<me->totvert; i++) 
+						pose_adds_vgroups__mapFunc(&map, i, (me->mvert+i)->co, NULL, NULL);
+				}
 				
-				for (curdef = meshobj->defbase.first; curdef; curdef=curdef->next)
-					if (!strcmp(curdef->name, name))
-						break;
-				map.dgflip= curdef;
-			}
-			else map.dgflip= NULL;
-			
-			/* get the root of the bone in global coords */
-			VECCOPY(map.head, bone->arm_head);
-			Mat4MulVecfl(poseobj->obmat, map.head);
-			
-            /* get the tip of the bone in global coords */
-			VECCOPY(map.tail, bone->arm_tail);
-            Mat4MulVecfl(poseobj->obmat, map.tail);
-			
-			/* use the optimal vertices instead of mverts */
-			map.dg= dg;
-			map.bone= bone;
-			if(dm->foreachMappedVert) 
-				dm->foreachMappedVert(dm, pose_adds_vgroups__mapFunc, (void*) &map);
-			else {
-				Mesh *me= meshobj->data;
-				int i;
-				for(i=0; i<me->totvert; i++) 
-					pose_adds_vgroups__mapFunc(&map, i, (me->mvert+i)->co, NULL, NULL);
 			}
-			
 		}
 	}
 	
@@ -683,6 +705,7 @@ void pose_adds_vgroups(Object *meshobj)
 void pose_flip_names(void)
 {
 	Object *ob= OBACT;
+	bArmature *arm= ob->data;
 	bPoseChannel *pchan;
 	char newname[32];
 	
@@ -691,10 +714,12 @@ void pose_flip_names(void)
 	if(ob==G.obedit || (ob->flag & OB_POSEMODE)==0) return;
 	
 	for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-		if(pchan->bone->flag & (BONE_ACTIVE|BONE_SELECTED)) {
-			BLI_strncpy(newname, pchan->name, sizeof(newname));
-			bone_flip_name(newname, 1);	// 1 = do strip off number extensions
-			armature_bone_rename(ob->data, pchan->name, newname);
+		if(arm->layer & pchan->bone->layer) {
+			if(pchan->bone->flag & (BONE_ACTIVE|BONE_SELECTED)) {
+				BLI_strncpy(newname, pchan->name, sizeof(newname));
+				bone_flip_name(newname, 1);	// 1 = do strip off number extensions
+				armature_bone_rename(ob->data, pchan->name, newname);
+			}
 		}
 	}
 	
@@ -711,6 +736,7 @@ void pose_flip_names(void)
 void pose_activate_flipped_bone(void)
 {
 	Object *ob= OBACT;
+	bArmature *arm= ob->data;
 	
 	if(ob==NULL) return;
 
@@ -721,8 +747,9 @@ void pose_activate_flipped_bone(void)
 		bPoseChannel *pchan, *pchanf;
 		
 		for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-			if(pchan->bone->flag & BONE_ACTIVE) {
-				break;
+			if(arm->layer & pchan->bone->layer) {
+				if(pchan->bone->flag & BONE_ACTIVE)
+					break;
 			}
 		}
 		if(pchan) {
@@ -755,3 +782,39 @@ void pose_activate_flipped_bone(void)
 	}
 }
 
+
+void pose_movetolayer(void)
+{
+	Object *ob= OBACT;
+	bArmature *arm;
+	short lay= 0;
+	
+	if(ob==NULL) return;
+	arm= ob->data;
+	
+	if(ob->flag & OB_POSEMODE) {
+		bPoseChannel *pchan;
+		
+		for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+			if(arm->layer & pchan->bone->layer) {
+				if(pchan->bone->flag & BONE_SELECTED)
+					lay |= pchan->bone->layer;
+			}
+		}
+		if(lay==0) return;
+		
+		if( movetolayer_short_buts(&lay)==0 ) return;
+		if(lay==0) return;
+
+		for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+			if(arm->layer & pchan->bone->layer) {
+				if(pchan->bone->flag & BONE_SELECTED)
+					pchan->bone->layer= lay;
+			}
+		}
+		
+		allqueue(REDRAWVIEW3D, 0);
+		allqueue(REDRAWACTION, 0);
+		allqueue(REDRAWBUTSEDIT, 0);
+	}
+}