Tuesday merger of bf-blender into orange branch.
[blender-staging.git] / source / blender / src / header_info.c
index f5e3b5d16d536bdaa7da2612215f3f4869c7bda5..5aebdac7c650d4f9c4da73d0d07a615aaa87d83e 100644 (file)
@@ -471,7 +471,7 @@ void do_info_buttons(unsigned short event)
 
                        set_scene(sce);
                }
-               BIF_preview_changed(G.buts);
+               BIF_preview_changed(ID_TE);
 
                break;
        case B_INFODELSCE:
@@ -1212,6 +1212,9 @@ void do_info_addmenu(void *arg, int event)
                        /* Lattice */
                        add_object_draw(OB_LATTICE);
                        break;
+               case 10:
+                       /* group instance not yet */
+                       break;
                default:
                        break;
        }
@@ -1826,12 +1829,12 @@ void info_buttons(void)
                uiDefIconTextButC(block, ICONTEXTROW,B_NEWSPACE, ICON_VIEW3D, windowtype_pup(), 8,0,XIC+10,YIC, &(curarea->butspacetype), 1.0, SPACEICONMAX, 0, 0, "Displays Current Window Type. Click for menu of available types.");
                
                /* STD SCREEN BUTTONS */
-               xco= std_libbuttons(block, xco, 0, 0, NULL, B_INFOSCR, (ID *)G.curscreen, 0, &G.curscreen->screennr, 1, 1, B_INFODELSCR, 0, 0);
+               xco= std_libbuttons(block, xco, 0, 0, NULL, B_INFOSCR, ID_SCR, 0, (ID *)G.curscreen, 0, &G.curscreen->screennr, 1, 1, B_INFODELSCR, 0, 0);
                
                xco +=8;
        
                /* STD SCENE BUTTONS */
-               xco= std_libbuttons(block, xco, 0, 0, NULL, B_INFOSCE, (ID *)G.scene, 0, &G.curscreen->scenenr, 1, 1, B_INFODELSCE, 0, 0);
+               xco= std_libbuttons(block, xco, 0, 0, NULL, B_INFOSCE, ID_SCE, 0, (ID *)G.scene, 0, &G.curscreen->scenenr, 1, 1, B_INFODELSCE, 0, 0);
        }
        else xco= 430;