[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34418] trunk/blender/source/blender/ editors/interface/interface_widgets.c: Bugfix #25619

[Ton Roosendaal]

Revision: 34418
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34418
Author:   ton
Date:     2011-01-20 16:29:43 +0000 (Thu, 20 Jan 2011)
Log Message:
-----------
Bugfix #25619

Paint modes: toolbar showed the preview image with double scaling applied,
so if UI zoomed in the image grew outside boundary.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_widgets.c

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2011-01-20 15:17:02 UTC (rev 34417)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2011-01-20 16:29:43 UTC (rev 34418)
@@ -746,7 +746,7 @@
 
 #define PREVIEW_PAD	4
 
-static void widget_draw_preview(BIFIconID icon, float aspect, float UNUSED(alpha), rcti *rect)
+static void widget_draw_preview(BIFIconID icon, float UNUSED(alpha), rcti *rect)
 {
 	int w, h, size;
 
@@ -762,7 +762,7 @@
 		int x = rect->xmin + w/2 - size/2;
 		int y = rect->ymin + h/2 - size/2;
 
-		UI_icon_draw_preview_aspect_size(x, y, icon, aspect, size);
+		UI_icon_draw_preview_aspect_size(x, y, icon, 1.0f, size);
 	}
 }
 
@@ -776,7 +776,7 @@
 	float aspect, height;
 	
 	if (but->flag & UI_ICON_PREVIEW) {
-		widget_draw_preview(icon, but->block->aspect, alpha, rect);
+		widget_draw_preview(icon, alpha, rect);
 		return;
 	}
 	
@@ -3118,7 +3118,7 @@
 	wt->state(wt, state);
 	wt->draw(&wt->wcol, rect, 0, 0);
 	
-	widget_draw_preview(iconid, 1.f, 1.f, rect);
+	widget_draw_preview(iconid, 1.0f, rect);
 	
 	if (state == UI_ACTIVE)
 		glColor3ubv((unsigned char*)wt->wcol.text);