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

[Ton Roosendaal]

Revision: 21198
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21198
Author:   ton
Date:     2009-06-27 18:35:42 +0200 (Sat, 27 Jun 2009)

Log Message:
-----------
2.5

Two bugfixes:
- When making 2d windows small (zero sized) the view2d data could get
  corrupted with NaN values. Clipped values correctly to 1.
- Search menu (ctrl+alt+f) had wrong color for selected text in text
  button

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
    branches/blender2.5/blender/source/blender/editors/interface/view2d.c

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-27 16:19:04 UTC (rev 21197)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-06-27 16:35:42 UTC (rev 21198)
@@ -1028,7 +1028,7 @@
 	{0, 0, 0, 255},
 	{25, 25, 25, 230},
 	{45, 45, 45, 230},
-	{255, 255, 255, 255},
+	{100, 100, 100, 255},
 	
 	{255, 255, 255, 255},
 	{255, 255, 255, 255},

Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d.c	2009-06-27 16:19:04 UTC (rev 21197)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c	2009-06-27 16:35:42 UTC (rev 21198)
@@ -316,6 +316,12 @@
 	if (v2d->keepzoom & V2D_LOCKZOOM_Y)
 		height= winy;
 		
+	/* values used to divide, so make it safe */
+	if(width<1) width= 1;
+	if(height<1) height= 1;
+	if(winx<1) winx= 1;
+	if(winy<1) winy= 1;
+	
 	/* keepzoom (V2D_KEEPZOOM set), indicates that zoom level on each axis must not exceed limits 
 	 * NOTE: in general, it is not expected that the lock-zoom will be used in conjunction with this
 	 */