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:
authormano-wii <germano.costa@ig.com.br>2019-02-26 17:11:04 +0300
committermano-wii <germano.costa@ig.com.br>2019-02-26 17:38:46 +0300
commitcb8614e398d395180a615e7e256a25cfe6f7c9eb (patch)
treef6b840c7e49aa5bd7f3c647c8a3f33e96dd13ec9 /source/blender/editors/space_view3d
parent07c017471797a063308795df41ff2b70eb05532c (diff)
Fix (unreported): Snap to grid not considering Focal Length.
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index bc9b0f107cc..2f9db19747f 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -790,12 +790,11 @@ float ED_view3d_grid_view_scale(
/* Allow 3 more subdivisions (see OBJECT_engine_init). */
grid_scale /= powf(grid_subdiv, 3);
- float grid_distance = rv3d->dist;
- float lvl = (logf(grid_distance / grid_scale) / logf(grid_subdiv));
+ /* `3.0` was a value obtained by trial and error in order to get
+ * a nice snap distance.*/
+ float grid_res = 3.0 * (rv3d->dist / v3d->lens);
+ float lvl = (logf(grid_res / grid_scale) / logf(grid_subdiv));
- /* 1.3f is a visually chosen offset for the
- * subdivision to match the visible grid. */
- lvl -= 1.3f;
CLAMP_MIN(lvl, 0.0f);
grid_scale *= pow(grid_subdiv, (int)lvl);