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

[Thomas Dinges]

Revision: 20675
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20675
Author:   dingto
Date:     2009-06-06 13:56:59 +0200 (Sat, 06 Jun 2009)

Log Message:
-----------
2.5 Buttons Window

Bugfix: World Tab wasn't accessible after deleting an object. 

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-06-06 11:43:14 UTC (rev 20674)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c	2009-06-06 11:56:59 UTC (rev 20675)
@@ -180,11 +180,8 @@
 	if((ob && (ob->type != OB_ARMATURE)) && (sbuts->mainb == (float)BCONTEXT_BONE))
 		sbuts->mainb = (float)BCONTEXT_DATA;
 	
-	 if(!ob && !ELEM(sbuts->mainb, (float)BCONTEXT_SCENE, (float)BCONTEXT_WORLD))
+	 if(!ob && !ELEM3(sbuts->mainb, (float)BCONTEXT_SCENE, (float)BCONTEXT_WORLD, (float)BCONTEXT_SEQUENCER))
 		sbuts->mainb = (float)BCONTEXT_WORLD;
-	 
-	if(!ob && !ELEM(sbuts->mainb, (float)BCONTEXT_SCENE, (float)BCONTEXT_SEQUENCER))
-		sbuts->mainb = (float)BCONTEXT_SEQUENCER;
 		
 	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;