[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53535] trunk/blender/source/blender/ editors: fix bad left aligned text when zoomed out.

[Campbell Barton]

Revision: 53535
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53535
Author:   campbellbarton
Date:     2013-01-03 15:52:31 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
fix bad left aligned text when zoomed out.
also minor change to cylinder_project_exec() - delay getting the MTFace. 

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

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2013-01-03 15:35:46 UTC (rev 53534)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2013-01-03 15:52:31 UTC (rev 53535)
@@ -1324,11 +1324,13 @@
 			/* icons default draw 0.8f x height */
 			rect->xmin += (int)(0.8f * BLI_rcti_size_y(rect));
 
-			if (but->editstr || (but->flag & UI_TEXT_LEFT))
-				rect->xmin += 0.4f * U.widget_unit;
+			if (but->editstr || (but->flag & UI_TEXT_LEFT)) {
+				rect->xmin += (0.4f * U.widget_unit) / but->block->aspect;
+			}
 		}
-		else if ((but->flag & UI_TEXT_LEFT))
-			rect->xmin += 0.4f * U.widget_unit;
+		else if ((but->flag & UI_TEXT_LEFT)) {
+			rect->xmin += (0.4f * U.widget_unit) / but->block->aspect;
+		}
 
 		/* always draw text for textbutton cursor */
 		widget_draw_text(fstyle, wcol, but, rect);

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2013-01-03 15:35:46 UTC (rev 53534)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2013-01-03 15:52:31 UTC (rev 53535)
@@ -1563,7 +1563,6 @@
 	uv_map_transform(C, op, center, rotmat);
 
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
 		if (!BM_elem_flag_test(efa, BM_ELEM_SELECT))
 			continue;
 		
@@ -1573,6 +1572,7 @@
 			uv_cylinder_project(luv->uv, l->v->co, center, rotmat);
 		}
 
+		tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
 		uv_map_mirror(em, efa, tf);
 	}