From 4d795cee4938f080f83aa367272d1ad25bba1fbd Mon Sep 17 00:00:00 2001 From: mano-wii Date: Mon, 31 Dec 2018 13:45:20 -0200 Subject: Fix T60015: snap to grid - snaps only to largest increment Caused by rBc7a96651dfa4 when trying to remove all uses of the deprecated `rv3d->gridview`. --- source/blender/editors/space_view3d/view3d_snap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_view3d/view3d_snap.c') diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index dbf2271e114..9729598b022 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -79,13 +79,14 @@ static int snap_sel_to_grid_exec(bContext *C, wmOperator *UNUSED(op)) ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph); 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 = ED_view3d_grid_scale(scene, v3d, NULL); + gridf = ED_view3d_grid_view_scale(scene, v3d, rv3d, NULL); if (obedit) { ViewLayer *view_layer = CTX_data_view_layer(C); @@ -516,10 +517,11 @@ void VIEW3D_OT_snap_selected_to_active(wmOperatorType *ot) static int snap_curs_to_grid_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); + RegionView3D *rv3d = CTX_wm_region_data(C); View3D *v3d = CTX_wm_view3d(C); float gridf, *curs; - gridf = ED_view3d_grid_scale(scene, v3d, NULL); + gridf = ED_view3d_grid_view_scale(scene, v3d, rv3d, NULL); curs = scene->cursor.location; curs[0] = gridf * floorf(0.5f + curs[0] / gridf); -- cgit v1.2.3