blender/blender
148
473
Fork 696
Code Issues 6.7k Pull Requests 894 Projects 18 Wiki Activity

Fix #110259: snapping with Xray alpha 1.0 occludes edited geometry #110263

Merged
Philipp Oeser merged 1 commits from mano-wii/blender:fix_110259 into blender-v3.6-release 2023-08-09 17:24:17 +02:00
Conversation 0 Commits 1 Files Changed 1 +15 -4
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 30c83ef895 - Show all commits

19
source/blender/editors/transform/transform_snap_object.cc
View File

@ -2778,8 +2778,19 @@ static eSnapMode snapEditMesh(SnapObjectContext *sctx,
float tobmat[4][4], clip_planes_local[MAX_CLIPPLANE_LEN][4];
transpose_m4_m4(tobmat, obmat);
for (int i = sctx->runtime.clip_plane_len; i--;) {
mul_v4_m4v4(clip_planes_local[i], tobmat, sctx->runtime.clip_plane[i]);
float(*clip_planes)[4] = sctx->runtime.clip_plane;
int clip_plane_len = sctx->runtime.clip_plane_len;
if (sctx->runtime.has_occlusion_plane && XRAY_FLAG_ENABLED(sctx->runtime.v3d)) {
/* #XRAY_ENABLED can return false even with the XRAY flag enabled, this happens because the
* alpha is 1.0 in this case. But even with the alpha being 1.0, the edit mesh is still not
* occluded. */
clip_planes++;
clip_plane_len--;
}
for (int i = clip_plane_len; i--;) {
mul_v4_m4v4(clip_planes_local[i], tobmat, clip_planes[i]);
}
if (sod->bvhtree[0] && (sctx->runtime.snap_to_flag & SCE_SNAP_MODE_VERTEX)) {
@ -2790,7 +2801,7 @@ static eSnapMode snapEditMesh(SnapObjectContext *sctx,
sctx->runtime.win_size,
sctx->runtime.mval,
clip_planes_local,
sctx->runtime.clip_plane_len,
clip_plane_len,
&nearest,
cb_snap_vert,
&nearest2d);
@ -2806,7 +2817,7 @@ static eSnapMode snapEditMesh(SnapObjectContext *sctx,
sctx->runtime.win_size,
sctx->runtime.mval,
clip_planes_local,
sctx->runtime.clip_plane_len,
clip_plane_len,
&nearest,
cb_snap_edge,
&nearest2d);