[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10795] trunk/blender/source/blender/src/ editarmature.c: Made it that hidden bones should arnt selected armature and posemode

Campbell Barton cbarton at metavr.com
Mon May 28 06:50:33 CEST 2007


Revision: 10795
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bforge-svn&revision=10795
Author:   campbellbarton
Date:     2007-05-28 06:50:30 +0200 (Mon, 28 May 2007)

Log Message:
-----------
Made it that hidden bones should arnt selected armature and posemode

Modified Paths:
--------------
    trunk/blender/source/blender/src/editarmature.c

Modified: trunk/blender/source/blender/src/editarmature.c
===================================================================
--- trunk/blender/source/blender/src/editarmature.c	2007-05-28 03:09:46 UTC (rev 10794)
+++ trunk/blender/source/blender/src/editarmature.c	2007-05-28 04:50:30 UTC (rev 10795)
@@ -1234,15 +1234,15 @@
 					sel=0;
 					break;
 				}
-			}
-//		}
+//			}
+		}
 	}
 	else sel= toggle;
 	
 	/*	Set the flags */
 	for (eBone=G.edbo.first;eBone;eBone=eBone->next){
 		if (sel==1) {
-			if(arm->layer & eBone->layer) {
+			if(arm->layer & eBone->layer && (eBone->flag & BONE_HIDDEN_A)==0) {
 				eBone->flag |= (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
 				if(eBone->parent)
 					eBone->parent->flag |= (BONE_TIPSEL);
@@ -2223,7 +2223,7 @@
 	/*	Determine if we're selecting or deselecting	*/
 	if (test==1) {
 		for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next)
-			if(pchan->bone->layer & arm->layer)
+			if(pchan->bone->layer & arm->layer && !(pchan->bone->flag & BONE_HIDDEN_P))
 				if(pchan->bone->flag & BONE_SELECTED)
 					break;
 		
@@ -2235,7 +2235,7 @@
 	
 	/*	Set the flags accordingly	*/
 	for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-		if(pchan->bone->layer & arm->layer) {
+		if(pchan->bone->layer & arm->layer && !(pchan->bone->flag & BONE_HIDDEN_P)) {
 			if(selectmode==0) pchan->bone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL|BONE_ACTIVE);
 			else if(selectmode==1) pchan->bone->flag |= BONE_SELECTED;
 			else pchan->bone->flag &= ~BONE_ACTIVE;





More information about the Bf-blender-cvs mailing list