[Bf-blender-cvs] [6901712734c] blender2.8: Transform: Use grid_scale to configure the incremental snapping.
mano-wii
noreply at git.blender.org
Fri Aug 24 23:04:53 CEST 2018
Commit: 6901712734c306df6ff38ea8c64b442981545a2a
Author: mano-wii
Date: Fri Aug 24 18:04:36 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB6901712734c306df6ff38ea8c64b442981545a2a
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.
===================================================================
M source/blender/editors/transform/transform.c
M source/blender/makesdna/DNA_view3d_types.h
===================================================================
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' */
More information about the Bf-blender-cvs
mailing list