[Bf-blender-cvs] [997b49a] master: Fix for own rB6919ffbf4b2f (we only consider unit scale when we do use a unit system!).

[Bastien Montagne]

Commit: 997b49a5f30ee0c1862d165530321811e5977d9d
Author: Bastien Montagne
Date:   Tue Mar 11 16:58:09 2014 +0100
https://developer.blender.org/rB997b49a5f30ee0c1862d165530321811e5977d9d

Fix for own rB6919ffbf4b2f (we only consider unit scale when we do use a unit system!).

Noted by Campbell, thanks!

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

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 7d1b759..ad54e8a 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3263,7 +3263,10 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
 	}
 
 	/* needs to be done always, gridview is adjusted in drawgrid() now, but only for ortho views. */
-	rv3d->gridview = v3d->grid / scene->unit.scale_length;
+	rv3d->gridview = v3d->grid;
+	if (scene->unit.system) {
+		rv3d->gridview /= scene->unit.scale_length;
+	}
 
 	if ((rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO)) {
 		if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {