From 96dd39b84f551bbb2f9adfd024dbaeafa22f5e49 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 21 Dec 2006 07:52:20 +0000 Subject: [PATCH] UV Image Window: Brought back the old "image properties" panel, which actually only showed options for real-time textures. Available in pulldown menu as "Real-time Properties". --- source/blender/src/drawimage.c | 2 +- source/blender/src/header_image.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index 48a99168923..da41f40602b 100644 --- a/source/blender/src/drawimage.c +++ b/source/blender/src/drawimage.c @@ -910,7 +910,7 @@ static void image_panel_game_properties(short cntrl) // IMAGE_HANDLER_GAME_PROPE block= uiNewBlock(&curarea->uiblocks, "image_panel_game_properties", UI_EMBOSS, UI_HELV, curarea->win); uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl); uiSetPanelHandler(IMAGE_HANDLER_GAME_PROPERTIES); // for close and esc - if(uiNewPanel(curarea, block, "Game Properties", "Image", 10, 10, 318, 204)==0) + if(uiNewPanel(curarea, block, "Real-time Properties", "Image", 10, 10, 318, 204)==0) return; if (ibuf) { diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index e2839307212..0d9f76b1681 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -449,7 +449,11 @@ static void do_image_viewmenu(void *arg, int event) case 12: /* composite preview */ toggle_blockhandler(curarea, IMAGE_HANDLER_PREVIEW, 0); scrarea_queue_winredraw(curarea); - + break; + case 13: /* Realtime Panel... */ + add_blockhandler(curarea, IMAGE_HANDLER_GAME_PROPERTIES, UI_PNL_UNSTOW); + break; + } allqueue(REDRAWVIEW3D, 0); } @@ -464,6 +468,7 @@ static uiBlock *image_viewmenu(void *arg_unused) uiBlockSetButmFunc(block, do_image_viewmenu, NULL); uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Properties...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Real-time Properties...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 13, ""); uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Paint Tool...|C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, ""); uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Curves Tool...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 11, ""); uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Composite Preview...|Shift P", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 12, "");