[Bf-blender-cvs] [c7a96651dfa] blender2.8: Fix unreported: the gridview is no longer computed, so the snapping functions have to use the actual grid scale.

[mano-wii]

Commit: c7a96651dfa47a72c3d5d7c21705ad2eaa7cc8a5
Author: mano-wii
Date:   Mon Aug 27 11:40:48 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBc7a96651dfa47a72c3d5d7c21705ad2eaa7cc8a5

Fix unreported: the gridview is no longer computed, so the snapping functions have to use the actual grid scale.

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

M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/editors/space_view3d/view3d_snap.c

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index d8fb5bed5af..3d169dceb4c 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -2025,9 +2025,11 @@ static int gp_snap_to_grid(bContext *C, wmOperator *UNUSED(op))
 {
 	bGPdata *gpd = ED_gpencil_data_get_active(C);
 	RegionView3D *rv3d = CTX_wm_region_data(C);
-	Depsgraph *depsgraph = CTX_data_depsgraph(C);                                      \
+	View3D *v3d = CTX_wm_view3d(C);
+	Scene *scene = CTX_data_scene(C);
+	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 	Object *obact = CTX_data_active_object(C);
-	const float gridf = rv3d->gridview;
+	const float gridf = ED_view3d_grid_scale(scene, v3d, NULL);
 
 	for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 		/* only editable and visible layers are considered */
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c
index 15be77ff6ab..11b2a7a2f47 100644
--- a/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@ -80,12 +80,13 @@ static int snap_sel_to_grid_exec(bContext *C, wmOperator *UNUSED(op))
 	Object *obedit = CTX_data_edit_object(C);
 	Scene *scene = CTX_data_scene(C);
 	RegionView3D *rv3d = CTX_wm_region_data(C);
+	View3D *v3d = CTX_wm_view3d(C);
 	TransVertStore tvs = {NULL};
 	TransVert *tv;
 	float gridf, imat[3][3], bmat[3][3], vec[3];
 	int a;
 
-	gridf = rv3d->gridview;
+	gridf = ED_view3d_grid_scale(scene, v3d, NULL);
 
 	if (obedit) {
 		ViewLayer *view_layer = CTX_data_view_layer(C);
@@ -497,7 +498,7 @@ static int snap_curs_to_grid_exec(bContext *C, wmOperator *UNUSED(op))
 	View3D *v3d = CTX_wm_view3d(C);
 	float gridf, *curs;
 
-	gridf = rv3d->gridview;
+	gridf = ED_view3d_grid_scale(scene, v3d, NULL);
 	curs = ED_view3d_cursor3d_get(scene, v3d)->location;
 
 	curs[0] = gridf * floorf(0.5f + curs[0] / gridf);