[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20298] branches/blender2.5/blender/source /blender/editors/space_buttons/buttons_header.c: 2.5 UI:

[Thomas Dinges]

Revision: 20298
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20298
Author:   dingto
Date:     2009-05-20 17:33:28 +0200 (Wed, 20 May 2009)

Log Message:
-----------
2.5 UI:

* Added missing buttons validation for Modifier Tab. 

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c

Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c	2009-05-20 15:20:24 UTC (rev 20297)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c	2009-05-20 15:33:28 UTC (rev 20298)
@@ -182,10 +182,16 @@
 	
 	 if(!ob && !ELEM(sbuts->mainb, (float)BCONTEXT_SCENE, (float)BCONTEXT_WORLD))
 		sbuts->mainb = (float)BCONTEXT_WORLD;
+		
+	if((ob && ELEM5(ob->type, OB_EMPTY, OB_MBALL, OB_LAMP, OB_CAMERA, OB_ARMATURE)) && (sbuts->mainb == (float) BCONTEXT_MODIFIER))
+		sbuts->mainb = (float)BCONTEXT_DATA;
 	
+	// Default panels
 	uiBlockBeginAlign(block);
 	uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_SCENE,			xco, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_SCENE, 0, 0, "Scene");
 	uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_WORLD,		xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_WORLD, 0, 0, "World");
+	
+	// Specific panels, check on active object seletion
 	if(ob) {
 		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_OBJECT_DATA,	xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_OBJECT, 0, 0, "Object");