blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Fix compile after last backport. 

rB6edc9438a461 introduced code from a recent refactor (rB3772dda4ab1b),
which isn't part of 3.2, so undo that part.
This commit is contained in:
Thomas Dinges 2022-06-28 15:38:12 +02:00
parent 6edc9438a4
commit 65b382941c
Notes: blender-bot 2023-02-14 08:38:11 +01:00 
Referenced by issue #98661, 3.2: Potential candidates for corrective releases
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_view3d/view3d_cursor_snap.c
View File

@ -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) &&