diff options
| author | mano-wii <germano.costa@ig.com.br> | 2018-08-25 00:04:36 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2018-08-25 00:04:36 +0300 |
| commit | 6901712734c306df6ff38ea8c64b442981545a2a (patch) | |
| tree | 6441b7f62668b38f52c29becacd9545beefcb4be /source | |
| parent | 7815276b9354331c3704b742fc8f4e512ca13325 (diff) | |
Transform: Use grid_scale to configure the incremental snapping.
`gridview` is no longer being set and also does not match the new grid's drawing.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 142460bb7fa..dee65d3a1c9 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4578,8 +4578,9 @@ static void initSnapSpatial(TransInfo *t, float r_snap[3]) RegionView3D *rv3d = t->ar->regiondata; if (rv3d) { + View3D *v3d = t->sa->spacedata.first; r_snap[0] = 0.0f; - r_snap[1] = rv3d->gridview * 1.0f; + r_snap[1] = ED_view3d_grid_scale(t->scene, v3d, NULL) * 1.0f; r_snap[2] = r_snap[1] * 0.1f; } } diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 317cde9009d..65b6192b9c8 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -96,7 +96,7 @@ typedef struct RegionView3D { float tw_axis_min[3], tw_axis_max[3]; float tw_axis_matrix[3][3]; - float gridview; + float gridview DNA_DEPRECATED; float viewquat[4]; /* view rotation, must be kept normalized */ float dist; /* distance from 'ofs' along -viewinv[2] vector, where result is negative as is 'ofs' */ |