[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25911] trunk/blender/source/blender/ editors/interface: Fix [#20224] Moving to layer pannel missing shortcuts

[Matt Ebb]

Revision: 25911
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25911
Author:   broken
Date:     2010-01-12 03:13:20 +0100 (Tue, 12 Jan 2010)

Log Message:
-----------
Fix [#20224] Moving to layer pannel missing shortcuts

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c
    trunk/blender/source/blender/editors/interface/interface_regions.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-01-12 01:50:34 UTC (rev 25910)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-01-12 02:13:20 UTC (rev 25911)
@@ -4819,9 +4819,16 @@
 							
 							if(but->type!=LABEL && but->type!=SEPR)
 								count++;
-
+							
+							/* exception for rna layer buts */
+							if(but->rnapoin.data && but->rnaprop) {
+								if (ELEM(RNA_property_subtype(but->rnaprop), PROP_LAYER, PROP_LAYER_MEMBER)) {
+									if (but->rnaindex== act-1)
+										doit=1;
+								}
+							}
 							/* exception for menus like layer buts, with button aligning they're not drawn in order */
-							if(but->type==TOGR) {
+							else if(but->type==TOGR) {
 								if(but->bitnr==act-1)
 									doit= 1;
 							}

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c	2010-01-12 01:50:34 UTC (rev 25910)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c	2010-01-12 02:13:20 UTC (rev 25911)
@@ -1339,7 +1339,7 @@
 		saferct= MEM_callocN(sizeof(uiSafetyRct), "uiSafetyRct");
 		saferct->safety= block->safety;
 		BLI_addhead(&block->saferct, saferct);
-		block->flag |= UI_BLOCK_POPUP;
+		block->flag |= UI_BLOCK_POPUP|UI_BLOCK_NUMSELECT;
 	}
 
 	/* the block and buttons were positioned in window space as in 2.4x, now