archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

(win32) you can now safely cancel the avicodec dialog

Browse Source
This commit is contained in:
Rob Haarsma
2003-05-11 16:48:55 +00:00
parent fe05ca64f2
commit ba3cab450b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/src/buttons.c
View File

@@ -6578,7 +6578,7 @@ void renderbuts(void)
#ifdef WITH_QUICKTIME #ifdef WITH_QUICKTIME
#if defined (_WIN32) || defined (__APPLE__) #if defined (_WIN32) || defined (__APPLE__)
if(!have_qtcodec) if(!have_qtcodec)
uiDefBut(block, LABEL, 0, "Codec: undefined", 892,yofs+42,225,20, 0, 0, 0, 0, 0, ""); uiDefBut(block, LABEL, 0, "Codec: not set", 892,yofs+42,225,20, 0, 0, 0, 0, 0, "");
else else
uiDefBut(block, LABEL, 0, qtcdname, 892,yofs+42,225,20, 0, 0, 0, 0, 0, ""); uiDefBut(block, LABEL, 0, qtcdname, 892,yofs+42,225,20, 0, 0, 0, 0, 0, "");
uiDefBut(block, BUT,B_SELECTCODEC, "Set codec", 892,yofs,112,20, 0, 0, 0, 0, 0, "Set codec settings for Quicktime"); uiDefBut(block, BUT,B_SELECTCODEC, "Set codec", 892,yofs,112,20, 0, 0, 0, 0, 0, "Set codec settings for Quicktime");
@@ -6600,7 +6600,7 @@ void renderbuts(void)
#endif /* WITH_QUICKTIME */ #endif /* WITH_QUICKTIME */
} else { } else {
#ifdef _WIN32 #ifdef _WIN32
if(G.scene->r.avicodecdata->avicodecname[0] == NULL) if(G.scene->r.avicodecdata == NULL)
uiDefBut(block, LABEL, 0, "Codec: not set.", 892,yofs+42,225,20, 0, 0, 0, 0, 0, ""); uiDefBut(block, LABEL, 0, "Codec: not set.", 892,yofs+42,225,20, 0, 0, 0, 0, 0, "");
else else
uiDefBut(block, LABEL, 0, G.scene->r.avicodecdata->avicodecname, 892,yofs+42,225,20, 0, 0, 0, 0, 0, ""); uiDefBut(block, LABEL, 0, G.scene->r.avicodecdata->avicodecname, 892,yofs+42,225,20, 0, 0, 0, 0, 0, "");

4
source/blender/src/ghostwinlay.c
View File

@@ -574,6 +574,10 @@ void window_raise(Window *win) {
#ifdef _WIN32 //FULLSCREEN #ifdef _WIN32 //FULLSCREEN
void window_toggle_fullscreen(Window *win, int fullscreen) { void window_toggle_fullscreen(Window *win, int fullscreen) {
/* these two lines make sure front and backbuffer are equal. for swapbuffers */
markdirty_all();
screen_swapbuffers();
if(fullscreen) if(fullscreen)
GHOST_SetWindowState(win->ghostwin, GHOST_kWindowStateFullScreen); GHOST_SetWindowState(win->ghostwin, GHOST_kWindowStateFullScreen);
else else