diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-05-10 09:36:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-05-10 09:47:57 +0300 |
commit | 401e7108075c46808bcc5e008e11767dcd09c04e (patch) | |
tree | 39c157151b0e12a23491c9f393d44607f7338a7a /source/blender/editors/transform | |
parent | ce65fae8f32c058ef50eb1a9a0a82472c4a68040 (diff) |
Correct armature-sketch snap context use
Use scene snap mode.
Also allow passing NULL ray-depth which falls back to BVH_RAYCAST_DIST_MAX.
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform_snap.c | 5 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index bde140a01f0..eb601db358f 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -1287,8 +1287,6 @@ bool snapObjectsTransform( float *dist_px, float r_loc[3], float r_no[3]) { - float ray_dist = BVH_RAYCAST_DIST_MAX; - return ED_transform_snap_object_project_view3d_ex( t->tsnap.object_context, &(const struct SnapObjectParams){ @@ -1297,8 +1295,7 @@ bool snapObjectsTransform( .use_object_edit = (t->flag & T_EDIT) != 0, .use_object_active = (t->options & CTX_GPENCIL_STROKES) == 0, }, - mval, dist_px, - &ray_dist, + mval, dist_px, NULL, r_loc, r_no, NULL); } diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index dd7b4dfe78c..57352f38789 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -1449,6 +1449,12 @@ bool ED_transform_snap_object_project_view3d_ex( { float ray_start[3], ray_normal[3], ray_orgigin[3]; + float ray_depth_fallback; + if (ray_depth == NULL) { + ray_depth_fallback = BVH_RAYCAST_DIST_MAX; + ray_depth = &ray_depth_fallback; + } + if (!ED_view3d_win_to_ray_ex( sctx->v3d_data.ar, sctx->v3d_data.v3d, mval, ray_orgigin, ray_normal, ray_start, true)) |