[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20735] branches/blender2.5/blender/source /blender/editors: 2.5

[Ton Roosendaal]

Revision: 20735
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20735
Author:   ton
Date:     2009-06-08 18:24:37 +0200 (Mon, 08 Jun 2009)

Log Message:
-----------
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

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c
    branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
    branches/blender2.5/blender/source/blender/editors/preview/previewrender.c
    branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c	2009-06-08 12:39:39 UTC (rev 20734)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c	2009-06-08 16:24:37 UTC (rev 20735)
@@ -580,7 +580,7 @@
 			else uiSetRoundBox(3);
 			
 			UI_ThemeColorShade(TH_BACK, -120);
-			uiRoundRect(rect->xmin, rect->ymin, rect->xmax, headrect.ymax+1, 8);
+			uiRoundRect(0.5f + rect->xmin, 0.5f + rect->ymin, 0.5f + rect->xmax, 0.5f + headrect.ymax+1, 8);
 		}
 		if(panel->flag & PNL_OVERLAP) {
 			if(panel->control & UI_PNL_SOLID) uiSetRoundBox(15);

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-06-08 12:39:39 UTC (rev 20734)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-06-08 16:24:37 UTC (rev 20735)
@@ -1632,6 +1632,7 @@
 	widget_init(&wtb);
 	
 	if(but->block->drawextra) {
+		/* note: drawextra can change rect +1 or -1, to match round errors of existing previews */
 		but->block->drawextra(C, but->poin, rect);
 		
 		/* make mask to draw over image */

Modified: branches/blender2.5/blender/source/blender/editors/preview/previewrender.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/preview/previewrender.c	2009-06-08 12:39:39 UTC (rev 20734)
+++ branches/blender2.5/blender/source/blender/editors/preview/previewrender.c	2009-06-08 16:24:37 UTC (rev 20735)
@@ -639,7 +639,12 @@
 	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 @@
 	}
 	/* 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);

Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c	2009-06-08 12:39:39 UTC (rev 20734)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c	2009-06-08 16:24:37 UTC (rev 20735)
@@ -130,6 +130,7 @@
 			else if(sbuts->mainb != BCONTEXT_TEXTURE)
 				sbuts->flag &= ~SB_WORLD_TEX;
 
+			sbuts->preview= 1;
 			break;
 	}
 }