From 5f6d8e59c4d6a32b4743fabd17678cf4a82bddb3 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sun, 12 Oct 2003 13:58:56 +0000 Subject: - Converted lamp buttons and world buttons, they're pretty! - menu auto open now is user preset, including 2 thresholds you can set - hilites of pulldown menus were not cleared, fixed - changed F4 key to logic. F5 will show lamp buttons, when lamp active - in 'shader context' buttons, clicking camera will show world - Converted lamp buttons and world buttons, they're pretty! - menu auto open now is user preset, including 2 thresholds you can set - hilites of pulldown menus were not cleared, fixed - changed F4 key to logic. F5 will show lamp buttons, when lamp active - in 'shader context' buttons, clicking camera will show world --- source/blender/src/header_buttonswin.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'source/blender/src/header_buttonswin.c') diff --git a/source/blender/src/header_buttonswin.c b/source/blender/src/header_buttonswin.c index ff442ddf66e..07777e6b28e 100644 --- a/source/blender/src/header_buttonswin.c +++ b/source/blender/src/header_buttonswin.c @@ -452,29 +452,10 @@ void buts_buttons(void) G.buts->lockpoin= id; if(G.buts->mainb==CONTEXT_SHADING) { +#if 0 int tab= G.buts->tab[CONTEXT_SHADING]; if(tab==TAB_SHADING_MAT) { -#if 0 -moved to buttonswin! - - if(ob && (ob->typetype) { - xco= std_libbuttons(block, xco, 0, 0, NULL, B_MATBROWSE, id, idfrom, &(G.buts->menunr), B_MATALONE, B_MATLOCAL, B_MATDELETE, B_AUTOMATNAME, B_KEEPDATA); - } - - /* COPY PASTE */ - if(curarea->headertype==HEADERTOP) { - uiDefIconBut(block, BUT, B_MATCOPY, ICON_COPYUP, xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Copies Material to the buffer"); - uiSetButLock(id && id->lib, "Can't edit library data"); - uiDefIconBut(block, BUT, B_MATPASTE, ICON_PASTEUP, xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Pastes Material from the buffer"); - } - else { - uiDefIconBut(block, BUT, B_MATCOPY, ICON_COPYDOWN, xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Copies Material to the buffer"); - uiSetButLock(id && id->lib, "Can't edit library data"); - uiDefIconBut(block, BUT, B_MATPASTE, ICON_PASTEDOWN, xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Pastes Material from the buffer"); - } - xco+=XIC; -#endif } else if(tab==TAB_SHADING_TEX) { if(G.buts->texfrom==0) { @@ -501,6 +482,7 @@ moved to buttonswin! else if(tab==TAB_SHADING_WORLD) { xco= std_libbuttons(block, xco, 0, 0, NULL, B_WORLDBROWSE, id, idfrom, &(G.buts->menunr), B_WORLDALONE, B_WORLDLOCAL, B_WORLDDELETE, 0, B_KEEPDATA); } +#endif } else if(G.buts->mainb==CONTEXT_EDITING) { -- cgit v1.2.3