Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2009-06-06 15:56:59 +0400
committerThomas Dinges <blender@dingto.org>2009-06-06 15:56:59 +0400
commitb770be4f1f364b0baa91ffc87da95ebe2176859b (patch)
treed6e1507111bba149cfe4b7499ef302b6c7b6a89e /source/blender/editors/space_buttons/buttons_header.c
parentacc88c9772795ffcbca352710626f83a870148a1 (diff)
2.5 Buttons Window
Bugfix: World Tab wasn't accessible after deleting an object.
Diffstat (limited to 'source/blender/editors/space_buttons/buttons_header.c')
-rw-r--r--source/blender/editors/space_buttons/buttons_header.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c
index 12ee528f8e0..316cb0e08b5 100644
--- a/source/blender/editors/space_buttons/buttons_header.c
+++ b/source/blender/editors/space_buttons/buttons_header.c
@@ -180,11 +180,8 @@ void buttons_header_buttons(const bContext *C, ARegion *ar)
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;