diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-12-04 20:18:58 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-12-04 20:18:58 +0300 |
| commit | 409f60d605c36c9f79a18f69fdacad268adc0c98 (patch) | |
| tree | b9cb84a7dee795aa885f623f35fc75a961823b87 | |
| parent | e49998807c56a37acde1e2019d4005fd6d673a3f (diff) | |
Bf-blender commit! :)
Forgot to put back window/screen-size clipping when opening render window.
Note for windows coders; check this diff, here's where you might need to
add an ifdef too for windows, to get the window opening correct for the
top of the screen (probably because of windows bottom toolbar?)
| -rw-r--r-- | source/blender/src/renderwin.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 5483d8e27cf..637c018587d 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -620,7 +620,10 @@ void calc_renderwin_rectangle(int posmask, int renderpos_r[2], int rendersize_r[ rendersize_r[1]*= G.scene->r.yparts; } - for (y=-1; y<=1; y++) { + rendersize_r[0]= CLAMPIS(rendersize_r[0], 0, scr_w); + rendersize_r[1]= CLAMPIS(rendersize_r[1], 0, scr_h-RW_HEADERY); + + for (y=-1; y<=1; y++) { for (x=-1; x<=1; x++) { if (posmask & (1<<((y+1)*3 + (x+1)))) { ndc_x+= x; @@ -638,6 +641,7 @@ void calc_renderwin_rectangle(int posmask, int renderpos_r[2], int rendersize_r[ renderpos_r[0]= (scr_w-rendersize_r[0])*(ndc_x*0.5 + 0.5); #ifdef __APPLE__ /* 44 pixels is topbar and window header... awaiting better fixes in ghost :) */ + rendersize_r[1]= CLAMPIS(rendersize_r[1], 0, scr_h-44-RW_HEADERY); renderpos_r[1]= -44-RW_HEADERY+(scr_h-rendersize_r[1])*(ndc_y*0.5 + 0.5); #else renderpos_r[1]= (scr_h-rendersize_r[1])*(ndc_y*0.5 + 0.5); |