- Bug located in outliner (missing break) by sgefant, thnx!
authorTon Roosendaal <ton@blender.org>
Mon, 8 Nov 2004 23:31:01 +0000 (23:31 +0000)
committerTon Roosendaal <ton@blender.org>
Mon, 8 Nov 2004 23:31:01 +0000 (23:31 +0000)
- 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.

source/blender/src/butspace.c
source/blender/src/outliner.c
source/blender/src/space.c

index 443c8a8845215dd8018338bcf81a635778e5c32c..c91a3438f6d0ae9996ff062c8f1165f245794674 100644 (file)
@@ -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;
index 1ecaf46bf0566346eeddaac6a6860817ecfbf305..210204135a7e203bf0f769db12999031033f8688 100644 (file)
@@ -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;
index 3432dd9513fe2d4769510d1fc784e2b4b3fef1b3..3a6de52099d8ef648e8e5eb3e7732234e6d3a70d 100644 (file)
@@ -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: