[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25159] trunk/blender/source/blender/ editors/space_view3d: Tweaks to the fading behaviour of 3d view grid subdivs, somewhat fix for

[Matt Ebb]

Revision: 25159
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25159
Author:   broken
Date:     2009-12-07 01:50:40 +0100 (Mon, 07 Dec 2009)

Log Message:
-----------
Tweaks to the fading behaviour of 3d view grid subdivs, somewhat fix for 
[#20246] grid subdivisionns doesn't works

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/editors/space_view3d/view3d_view.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2009-12-07 00:16:57 UTC (rev 25158)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2009-12-07 00:50:40 UTC (rev 25159)
@@ -343,7 +343,7 @@
 					}
 				}
 				else {	// start blending out
-					UI_ThemeColorBlend(TH_BACK, TH_GRID, dx/(GRID_MIN_PX*10));
+					UI_ThemeColorBlend(TH_BACK, TH_GRID, dx/(GRID_MIN_PX*6));
 					drawgrid_draw(ar, wx, wy, x, y, dx);
 
 					UI_ThemeColor(TH_GRID);
@@ -351,7 +351,7 @@
 				}
 			}
 			else {	// start blending out (GRID_MIN_PX < dx < (GRID_MIN_PX*10))
-				UI_ThemeColorBlend(TH_BACK, TH_GRID, dx/(GRID_MIN_PX*10));
+				UI_ThemeColorBlend(TH_BACK, TH_GRID, dx/(GRID_MIN_PX*6));
 				drawgrid_draw(ar, wx, wy, x, y, dx);
 
 				UI_ThemeColor(TH_GRID);
@@ -370,21 +370,21 @@
 						drawgrid_draw(ar, wx, wy, x, y, dx);
 					}
 					else {
-						UI_ThemeColorBlend(TH_BACK, TH_GRID, dx/(GRID_MIN_PX*10));
+						UI_ThemeColorBlend(TH_BACK, TH_GRID, dx/(GRID_MIN_PX*6));
 						drawgrid_draw(ar, wx, wy, x, y, dx);
 						UI_ThemeColor(TH_GRID);
 						drawgrid_draw(ar, wx, wy, x, y, dx*sublines);
 					}
 				}
 				else {
-					UI_ThemeColorBlend(TH_BACK, TH_GRID, dx/(GRID_MIN_PX*10));
+					UI_ThemeColorBlend(TH_BACK, TH_GRID, dx/(GRID_MIN_PX*6));
 					drawgrid_draw(ar, wx, wy, x, y, dx);
 					UI_ThemeColor(TH_GRID);
 					drawgrid_draw(ar, wx, wy, x, y, dx*sublines);
 				}
 			}
 			else {
-				UI_ThemeColorBlend(TH_BACK, TH_GRID, dx/(GRID_MIN_PX*10));
+				UI_ThemeColorBlend(TH_BACK, TH_GRID, dx/(GRID_MIN_PX*6));
 				drawgrid_draw(ar, wx, wy, x, y, dx);
 				UI_ThemeColor(TH_GRID);
 				drawgrid_draw(ar, wx, wy, x, y, dx*sublines);

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2009-12-07 00:16:57 UTC (rev 25158)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2009-12-07 00:50:40 UTC (rev 25159)
@@ -1942,7 +1942,6 @@
 		mul_v3_fl(fly->rv3d->ofs, -1.0f); /*flip the vector*/
 
 		fly->rv3d->dist=0.0;
-		fly->rv3d->viewbut=0;
 
 		/* used for recording */
 //XXX2.5		if(v3d->camera->ipoflag & OB_ACTION_OB)
@@ -1982,7 +1981,7 @@
 	if (fly->state == FLY_CANCEL) {
 	/* Revert to original view? */
 		if (fly->persp_backup==RV3D_CAMOB) { /* a camera view */
-			rv3d->viewbut=1;
+
 			VECCOPY(v3d->camera->loc, fly->ofs_backup);
 			VECCOPY(v3d->camera->rot, fly->rot_backup);
 			DAG_id_flush_update(&v3d->camera->id, OB_RECALC_OB);