griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #109641: Snapping doesn't respect Clipping Border

Browse Source 
The clip planes in `rv3d->clip` were not being added.
This commit is contained in:
Germano Cavalcante
2023-07-03 14:37:27 -03:00
parent 5907ab0364
commit d0bbae8596
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/intern/BLI_kdopbvh.c
View File

@@ -145,7 +145,7 @@ typedef struct BVHNearestProjectedData {
const BVHTree *tree;
struct DistProjectedAABBPrecalc precalc;
bool closest_axis[3];
float clip_plane[6][4];
float clip_plane[7][4];
int clip_plane_len;
BVHTree_NearestProjectedCallback callback;
void *userdata;

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

@@ -1047,6 +1047,12 @@ static bool snap_object_context_runtime_init(SnapObjectContext *sctx,
sctx->runtime.clip_plane[1]);
sctx->runtime.clip_plane_len = 2;
if (rv3d->rflag & RV3D_CLIPPING) {
memcpy(&sctx->runtime.clip_plane[2], rv3d->clip, 4 * sizeof(rv3d->clip[0]));
sctx->runtime.clip_plane_len = 6;
}
sctx->runtime.rv3d = rv3d;
}
@@ -1325,7 +1331,7 @@ eSnapMode ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
float new_clipplane[4];
BLI_ASSERT_UNIT_V3(sctx->ret.no);
plane_from_point_normal_v3(new_clipplane, sctx->ret.loc, sctx->ret.no);
if (dot_v3v3(sctx->runtime.clip_plane[0], new_clipplane) > 0.0f) {
if (dot_v3v3(sctx->runtime.ray_dir, new_clipplane) > 0.0f) {
/* The plane is facing the wrong direction. */
negate_v4(new_clipplane);
}

2
source/blender/editors/transform/transform_snap_object.hh
View File

@@ -8,7 +8,7 @@
#pragma once
#define MAX_CLIPPLANE_LEN 3
#define MAX_CLIPPLANE_LEN 7
#define SNAP_TO_EDGE_ELEMENTS \
(SCE_SNAP_TO_EDGE | SCE_SNAP_TO_EDGE_ENDPOINT | SCE_SNAP_TO_EDGE_MIDPOINT | \