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".

diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c
index 48a9916892303ebf2af59e64e30fb107f5f6f774..da41f40602be54adcf8adb4d79e1b88e0e646778 100644 (file)
--- 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 e283930721206fd2e252c19009be062ce71181d5..0d9f76b168176b620c714ffdee14cfbeea1a7041 100644 (file)
--- 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, "");