Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-03-11 19:58:09 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-03-11 19:58:09 +0400
commit997b49a5f30ee0c1862d165530321811e5977d9d (patch)
treed0fc5f273fb6d1edb679b8757c541b2634154f31
parent6919ffbf4b2fdd1de3792de62ab9b613bef2d40f (diff)
Fix for own rB6919ffbf4b2f (we only consider unit scale when we do use a unit system!).
Noted by Campbell, thanks!
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 7d1b759d57c..ad54e8a5eff 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) {