From 65b382941c7b1488a481406548af47347b465d30 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Tue, 28 Jun 2022 15:38:12 +0200 Subject: Fix compile after last backport. rB6edc9438a461 introduced code from a recent refactor (rB3772dda4ab1b), which isn't part of 3.2, so undo that part. --- source/blender/editors/space_view3d/view3d_cursor_snap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/space_view3d/view3d_cursor_snap.c b/source/blender/editors/space_view3d/view3d_cursor_snap.c index c0555574026..35f0d7fd57a 100644 --- a/source/blender/editors/space_view3d/view3d_cursor_snap.c +++ b/source/blender/editors/space_view3d/view3d_cursor_snap.c @@ -693,7 +693,7 @@ static void v3d_cursor_snap_update(V3DSnapCursorState *state, /* Negate the face normal according to the view. */ float ray_dir[3]; if (rv3d->is_persp) { - BLI_assert_msg(snap_elem != SCE_SNAP_MODE_NONE, + BLI_assert_msg(snap_elem != 0, "Use of variable `co` without it being computed"); sub_v3_v3v3(ray_dir, co, rv3d->viewinv[3]); /* No need to normalize. */ @@ -718,7 +718,7 @@ static void v3d_cursor_snap_update(V3DSnapCursorState *state, float *co_depth = snap_elem ? co : scene->cursor.location; snap_elem &= ~data_intern->snap_elem_hidden; - if (snap_elem == SCE_SNAP_MODE_NONE) { + if (snap_elem == 0) { RegionView3D *rv3d = region->regiondata; const float *plane_normal = omat[state->plane_axis]; bool do_plane_isect = (state->plane_depth != V3D_PLACE_DEPTH_CURSOR_VIEW) && -- cgit v1.2.3