[Bf-blender-cvs] [5cc199e] master: Fix T42945: rv3d->gridview was not set correctly in view3d_draw_objects.

[Bastien Montagne]

Commit: 5cc199e495813af126c197b81986bea8184f6b00
Author: Bastien Montagne
Date:   Fri Dec 19 10:07:02 2014 +0100
Branches: master
https://developer.blender.org/rB5cc199e495813af126c197b81986bea8184f6b00

Fix T42945: rv3d->gridview was not set correctly in view3d_draw_objects.

This fixes both transform snapping in persp views, and 'snap cursor to grid' feature.

Was only really visible with Imperial units.

===================================================================

M	source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 9a81597..b3884cb 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2646,10 +2646,7 @@ static void view3d_draw_objects(
 
 	if (!draw_offscreen) {
 		/* needs to be done always, gridview is adjusted in drawgrid() now, but only for ortho views. */
-		rv3d->gridview = v3d->grid;
-		if (scene->unit.system) {
-			rv3d->gridview /= scene->unit.scale_length;
-		}
+		rv3d->gridview = ED_view3d_grid_scale(scene, v3d, grid_unit);
 
 		if ((rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO)) {
 			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {