? .git
? user-config.py
? tools/Blender.pyc
? tools/__init__.pyc
? tools/bcolors.pyc
? tools/btools.pyc
Index: source/blender/src/drawview.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawview.c,v
retrieving revision 1.284
diff -u -r1.284 drawview.c
--- source/blender/src/drawview.c	9 Apr 2007 11:43:46 -0000	1.284
+++ source/blender/src/drawview.c	9 Apr 2007 16:10:21 -0000
@@ -1876,12 +1876,12 @@
 	uiDefButF(block, NUM, B_ARMATUREPANEL3, "RotZ:",	30, 30, 120, 19, tfp->ob_eul+2, -1000.0, 1000.0, 100, 3, "");
 	
 	uiBlockBeginAlign(block);
-	uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEX, REDRAWVIEW3D, ICON_UNLOCKED,	160,70,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
-	uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleX:",	180, 70, 120, 19, pchan->size, -lim, lim, 10, 3, "");
-	uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEY, REDRAWVIEW3D, ICON_UNLOCKED,	160,50,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
-	uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleY:",	180, 50, 120, 19, pchan->size+1, -lim, lim, 10, 3, "");
-	uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEZ, REDRAWVIEW3D, ICON_UNLOCKED,	160,30,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
-	uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleZ:",	180, 30, 120, 19, pchan->size+2, -lim, lim, 10, 3, "");
+	uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEX, REDRAWVIEW3D, ICON_UNLOCKED,	160,110,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
+	uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleX:",	180, 110, 120, 19, pchan->size, -lim, lim, 10, 3, "");
+	uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEY, REDRAWVIEW3D, ICON_UNLOCKED,	160,90,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
+	uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleY:",	180, 90, 120, 19, pchan->size+1, -lim, lim, 10, 3, "");
+	uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEZ, REDRAWVIEW3D, ICON_UNLOCKED,	160,70,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
+	uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleZ:",	180, 70, 120, 19, pchan->size+2, -lim, lim, 10, 3, "");
 	uiBlockEndAlign(block);
 }
 
@@ -2176,6 +2176,16 @@
 	}
 }
 
+static void panel_armature_layer_cb(void *lay_v, void *value_v)
+{
+	short *layer= lay_v;
+	int value= (int)value_v;
+
+	if(*layer==0 || G.qual==0) *layer= value;
+	allqueue(REDRAWBUTSEDIT, 0);
+	allqueue(REDRAWACTION, 0);
+	allqueue(REDRAWNLA, 0);
+}
 
 static void view3d_panel_object(short cntrl)	// VIEW3D_HANDLER_OBJECT
 {
@@ -2185,6 +2195,8 @@
 	TransformProperties *tfp;
 	float lim;
 	static char hexcol[128];
+	bArmature *arm;
+	int a;
 	
 	if(ob==NULL) return;
 
@@ -2330,6 +2342,30 @@
 			uiBlockEndAlign(block);
 		}
 	}
+
+	if((ob->type==OB_ARMATURE) && (!G.obedit)) {
+		uiDefBut(block, LABEL, 0, "Armature Layer", 160, 50, 150, 19, 0, 0, 0, 0, 0, "");
+		arm = ob->data;
+
+		/* layers */
+		uiBlockBeginAlign(block);
+		for(a= 0; a<8; a++) {
+			bt= uiDefButBitS(block, BUT_TOGDUAL, 1<<a, REDRAWVIEW3D, "", 160+19*a, 30, 19, 19, &arm->layer, 0, 0, 0, 0, "");
+			uiButSetFunc(bt, panel_armature_layer_cb, &arm->layer, (void *)(1<<a));
+		}
+
+		uiBlockBeginAlign(block);
+		for(a= 8; a<16; a++) {
+			bt= uiDefButBitS(block, BUT_TOGDUAL, 1<<a, REDRAWVIEW3D, "", 160+19*(a-8), 10, 19, 19, &arm->layer, 0, 0, 0, 0, "");
+			uiButSetFunc(bt, panel_armature_layer_cb, &arm->layer, (void *)(1<<a));
+		}
+		uiBlockEndAlign(block);
+		/* need here to. */
+		/* quite bad here, but I don't know a better place for copy... */
+		if(ob->pose)
+			ob->pose->proxy_layer= arm->layer;
+	}
+
 	uiClearButLock();
 }