Added Dump 3dView and Dump Screen to the File menu
authorKent Mein <mein@cs.umn.edu>
Wed, 29 Sep 2004 16:27:12 +0000 (16:27 +0000)
committerKent Mein <mein@cs.umn.edu>
Wed, 29 Sep 2004 16:27:12 +0000 (16:27 +0000)
with their shortcuts.

Kent

source/blender/include/BIF_toolbox.h
source/blender/src/editscreen.c
source/blender/src/header_info.c
source/blender/src/screendump.c
source/blender/src/toets.c
source/gameengine/BlenderRoutines/KX_BlenderGL.cpp

index 1b7e05c521749f3533d4a35ce10b98cfa096981f..095bfb31acdd5f0f77e8270cc779b68a10c9a018 100644 (file)
@@ -127,7 +127,7 @@ void add_numbut (int nr, int type, char *str, float min, float max, void *poin,
 void clever_numbuts (void);
 void replace_names_but (void);
 
-void BIF_screendump(void);
+void BIF_screendump(int fscreen);
 void write_screendump(char *name);
 
 #endif
index a5760ed35e852fff77627a3ecd6b7afd6825ac2c..3e7d0c93d85901d3cd579727990dd22a9dd0c684 100644 (file)
@@ -851,7 +851,7 @@ unsigned short extern_qread_ext(short *val, char *ascii)
        else if(event==INPUTCHANGE) ext_inputchange= *val;
        else if(event==MOUSEY || event==MOUSEX) ext_mousemove= 1;
        else if((G.qual & (LR_CTRLKEY|LR_ALTKEY)) && event==F3KEY) {
-               if(*val) BIF_screendump();
+               if(*val) BIF_screendump(0);
        }
 
        return event;
index 76fdbae52f0c21ac515b11504ebb41759afd0836..2c53eed6eddda365bdd03877e07ebc9e0a9c4158 100644 (file)
@@ -868,6 +868,12 @@ static void do_info_filemenu(void *arg, int event)
        case 23: /* save dynamic runtime */
                activate_fileselect(FILE_SPECIAL, "Save Dynamic Runtime", "", write_runtime_check_dynamic);
                break;
+       case 24:
+               BIF_screendump(0);
+               break;
+       case 25:
+               BIF_screendump(1);
+               break;
        case 10: /* pack data */
                check_packAll();
                break;
@@ -933,6 +939,8 @@ static uiBlock *info_filemenu(void *arg_unused)
        uiDefBut(block, SEPR, 0, "",                                    0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Image...|F3",                       0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Dump 3DView|Ctrl F3",                    0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 24, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Dump Screen|Ctrl Shift F3",                      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 25, "");
 #if GAMEBLENDER == 1
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Runtime...",                        0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 22, "");
 #ifdef _WIN32
@@ -943,6 +951,7 @@ static uiBlock *info_filemenu(void *arg_unused)
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Default Settings|Ctrl U",                   0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 31, "");
 
+
        uiDefBut(block, SEPR, 0, "",                                    0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Append...|Shift F1",     0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
index 011d50d9600d1235691d33aa5c033722832f97d6..00cce259954e29d1dbcf4c9a2428aab3275701e9 100644 (file)
@@ -113,7 +113,7 @@ void write_screendump(char *name)
 }
 
 /* get dump from frontbuffer */
-void BIF_screendump(void)
+void BIF_screendump(int fscreen)
 {
        extern uiBut *UIbuttip; // interface.c
        static int wasmenu= 0;
@@ -133,7 +133,7 @@ void BIF_screendump(void)
        if(dumprect) MEM_freeN(dumprect);
        dumprect= NULL;
        
-       if(UIbuttip || (G.qual & LR_SHIFTKEY)) {                /* full screen */
+       if(UIbuttip || (G.qual & LR_SHIFTKEY) || fscreen) {     /* full screen */
                x= 0;
                y= 0;
                
index 67bc1eab8ec6eeeb35a837729e21315409015bf5..41991d44792637c789a38dfb23103d1b8cbb3594 100644 (file)
@@ -579,7 +579,7 @@ int blenderqread(unsigned short event, short val)
                }
                else if(G.qual & LR_CTRLKEY) {
                        /* all alt+ctrl+shift combos are needed here... */
-                       BIF_screendump();
+                       BIF_screendump(0);
                }
                break;
        case F4KEY:
index 0c71845394b231d461d796b826889c7c0afaea88..6d77d76a0da0386ec17e8de49e7adf152d62bd69 100644 (file)
@@ -257,8 +257,7 @@ void BL_MakeScreenShot(struct ScrArea *area, const char* filename)
        // filename read - only
        
          /* XXX will need to change at some point */
-       BIF_screendump();
-/*     BIF_screendump(area); */
+       BIF_screendump(0);
 
        // write+read filename
        write_screendump((char*) copyfilename);