2.5

Small fixes:

- Preview render now accepts resize of 1 pixel without re-render,
  solves re-renders on scrolling window or dragging panel, because
  of float rounding.
- Panel dragging outline was off 0.5 pixel, showed as fat AA lines
- On switching tab, the preview gets re-rendered

1 files changed, 8 insertions, 2 deletions

diff --git a/source/blender/editors/preview/previewrender.c b/source/blender/editors/preview/previewrender.c
index 56ec22a44b0..b0d093dc10b 100644
--- a/source/blender/editors/preview/previewrender.c
+++ b/source/blender/editors/preview/previewrender.c
@@ -639,7 +639,12 @@ void ED_preview_draw(const bContext *C, void *idp, rcti *rect)
 	RE_GetResultImage(RE_GetRender(name), &rres);
 
 	if(rres.rectf) {
-		if(rres.rectx==newx && rres.recty==newy) {
+		
+		if( ABS(rres.rectx-newx)<2 && ABS(rres.recty-newy)<2 ) {
+			/* correct size, then black outline matches */
+			rect->xmax= rect->xmin + rres.rectx;
+			rect->ymax= rect->ymin + rres.recty;
+		
 			glaDrawPixelsSafe(rect->xmin, rect->ymin, rres.rectx, rres.recty, rres.rectx, GL_RGBA, GL_FLOAT, rres.rectf);
 			ok= 1;
 		}
@@ -1039,7 +1044,8 @@ static void shader_preview_startjob(void *customdata, short *stop, short *do_upd
 	}
 	/* lens adjust */
 	oldlens= ((Camera *)sce->camera->data)->lens;
-	((Camera *)sce->camera->data)->lens *= (float)sp->sizey/(float)sp->sizex;
+	if(sp->sizex > sp->sizey)
+		((Camera *)sce->camera->data)->lens *= (float)sp->sizey/(float)sp->sizex;
 
 	/* entire cycle for render engine */
 	RE_SetCamera(re, sce->camera);