[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20091] branches/blender2.5/blender/source /blender/editors/space_buttons/buttons_header.c: just a small tweak to the buttons window header buttons, seperating the global buttons like scene and world from the sub buttons like ob data and materials , also tweaked the object checks aswell

Michael Fox mfoxdogg at gmail.com
Thu May 7 03:20:47 CEST 2009


Revision: 20091
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20091
Author:   mfoxdogg
Date:     2009-05-07 03:20:43 +0200 (Thu, 07 May 2009)

Log Message:
-----------
just a small tweak to the buttons window header buttons, seperating the global buttons like scene and world from the sub buttons like ob data and materials, also tweaked the object checks aswell

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-07 00:12:37 UTC (rev 20090)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c	2009-05-07 01:20:43 UTC (rev 20091)
@@ -176,12 +176,20 @@
 	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");
 	uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_OBJECT_DATA,	xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_OBJECT, 0, 0, "Object");
+
+	xco+= XIC/2;	
+	uiBlockEndAlign(block);
+
+	uiBlockBeginAlign(block);
 	uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	dataicon,		xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_DATA, 0, 0, "Object Data");
 	if(ob && ELEM5(ob->type, OB_MESH, OB_SURF, OB_MBALL, OB_CURVE, OB_FONT))
 		uiDefIconButS(block, ROW, B_BUTSPREVIEW,	ICON_MATERIAL,			xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_MATERIAL, 0, 0, "Material");
-	uiDefIconButS(block, ROW, B_BUTSPREVIEW,	ICON_TEXTURE,	xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_TEXTURE, 0, 0, "Texture");
+	if(ob && ELEM6(ob->type, OB_MESH, OB_SURF, OB_MBALL, OB_CURVE, OB_FONT, OB_LAMP))
+		uiDefIconButS(block, ROW, B_BUTSPREVIEW,	ICON_TEXTURE,	xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_TEXTURE, 0, 0, "Texture");
 	if(ob && ELEM5(ob->type, OB_MESH, OB_SURF, OB_MBALL, OB_CURVE, OB_FONT))
 		uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_PARTICLES,	xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_PARTICLE, 0, 0, "Particles");
+
+	if(ob && ELEM6(ob->type, OB_MESH, OB_SURF, OB_MBALL, OB_CURVE, OB_FONT, OB_EMPTY))
 	uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,	ICON_PHYSICS,	xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_PHYSICS, 0, 0, "Physics");
 	
 	xco+= XIC;





More information about the Bf-blender-cvs mailing list