diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-24 04:13:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-24 04:16:14 +0300 |
| commit | c3e7dfa82d1734505dfb82d68690bab9544795ee (patch) | |
| tree | 103ce13a6131dcfaf2d62f9dfafad27629af395b /source/blender/editors/transform/transform_snap.c | |
| parent | 68922e466028f9508d4a0a38b479e2f34850ad84 (diff) | |
Fix T46816: Vert/Edge snap fails at edge of bounds
Diffstat (limited to 'source/blender/editors/transform/transform_snap.c')
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 4f003830238..2251dedc268 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -1546,6 +1546,13 @@ static bool snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMes * Threshold is rather high, but seems to be needed to get good behavior, see T46099. */ bb = BKE_boundbox_ensure_minimum_dimensions(bb, &bb_temp, 1e-1f); + /* Exact value here is arbitrary (ideally we would scale in pixel-space based on 'r_dist_px'), + * scale up so we can snap against verts & edges on the boundbox, see T46816. */ + if (ELEM(snap_mode, SCE_SNAP_MODE_VERTEX, SCE_SNAP_MODE_EDGE)) { + BKE_boundbox_scale(&bb_temp, bb, 1.0f + 1e-1f); + bb = &bb_temp; + } + if (!BKE_boundbox_ray_hit_check(bb, ray_start_local, ray_normal_local, &len_diff)) { return retval; } |