diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-11-09 02:31:01 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-11-09 02:31:01 +0300 |
| commit | 7777fa9ae23e4a2525f357634e049795f951511f (patch) | |
| tree | 2a89005573fe789f697e07e55f16a23a8c14864b | |
| parent | b00b82ca739f56f728127c9aa0d42dac0d9b12e4 (diff) | |
- Bug located in outliner (missing break) by sgefant, thnx!
- On click on camera object in outliner, world buttons didnt display always
Plus; commented out the calls to select items with rightmouse. This is too
much WIP for official release, too much not working, and Matt prefers time
to further work on it as well.
| -rw-r--r-- | source/blender/src/butspace.c | 3 | ||||
| -rw-r--r-- | source/blender/src/outliner.c | 1 | ||||
| -rw-r--r-- | source/blender/src/space.c | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/src/butspace.c b/source/blender/src/butspace.c index 443c8a88452..c91a3438f6d 100644 --- a/source/blender/src/butspace.c +++ b/source/blender/src/butspace.c @@ -333,7 +333,8 @@ static void butspace_context_switch(SpaceButs *buts, Object *new) int tab= buts->tab[CONTEXT_SHADING]; if(tab == TAB_SHADING_WORLD) { - if(new->type==OB_LAMP) { + if(new->type==OB_CAMERA); + else if(new->type==OB_LAMP) { buts->tab[CONTEXT_SHADING]= TAB_SHADING_LAMP; } else buts->tab[CONTEXT_SHADING]= TAB_SHADING_MAT; diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index 1ecaf46bf05..210204135a7 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -555,6 +555,7 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i if(wrld->mtex[a]) outliner_add_element(soops, &te->subtree, wrld->mtex[a]->tex, te, 0, a); } } + break; case ID_KE: { Key *key= (Key *)id; diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 3432dd9513f..3a6de52099d 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -3800,14 +3800,14 @@ static void winqreadoopsspace(ScrArea *sa, void *spacedata, BWinEvent *evt) view2dmove(event); /* in drawipo.c */ break; case RIGHTMOUSE: - outliner_select(sa); + // outliner_select(sa); break; case AKEY: - outliner_toggle_selected(sa); + // outliner_toggle_selected(sa); break; case WKEY: - outliner_operation_menu(sa); + // outliner_operation_menu(sa); break; case HOMEKEY: |