From 84474b0171eba502cbde345ce44707ba6dde7203 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 6 May 2018 15:56:09 +0200 Subject: Object Snap: add object & matrix to view ray cast Some snap functions already exposed this. --- .../blender/editors/include/ED_transform_snap_object_context.h | 3 ++- source/blender/editors/transform/transform_snap.c | 3 ++- source/blender/editors/transform/transform_snap_object.c | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h index 156b0ab36b0..c20d92963a9 100644 --- a/source/blender/editors/include/ED_transform_snap_object_context.h +++ b/source/blender/editors/include/ED_transform_snap_object_context.h @@ -114,7 +114,8 @@ bool ED_transform_snap_object_project_view3d_ex( const struct SnapObjectParams *params, const float mval[2], float *dist_px, float *ray_depth, - float r_loc[3], float r_no[3], int *r_index); + float r_loc[3], float r_no[3], int *r_index, + struct Object **r_ob, float r_obmat[4][4]); bool ED_transform_snap_object_project_view3d( struct SnapObjectContext *sctx, const unsigned short snap_to, diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 5750224de3d..660a3748191 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -1217,7 +1217,8 @@ bool snapObjectsTransform( .use_object_edit_cage = (t->flag & T_EDIT) != 0, }, mval, dist_px, NULL, - r_loc, r_no, NULL); + r_loc, r_no, NULL, + NULL, NULL); } diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 94c473d6a65..1293d26bc65 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -2347,7 +2347,8 @@ bool ED_transform_snap_object_project_view3d_ex( const struct SnapObjectParams *params, const float mval[2], float *dist_px, float *ray_depth, - float r_loc[3], float r_no[3], int *r_index) + float r_loc[3], float r_no[3], int *r_index, + Object **r_ob, float r_obmat[4][4]) { float ray_origin[3], ray_start[3], ray_normal[3], depth_range[2], ray_end[3]; @@ -2379,7 +2380,7 @@ bool ED_transform_snap_object_project_view3d_ex( sctx, ray_start, ray_normal, params->snap_select, params->use_object_edit_cage, - ray_depth, r_loc, r_no, r_index, NULL, NULL, NULL); + ray_depth, r_loc, r_no, r_index, r_ob, r_obmat, NULL); } else { SnapData snapdata; @@ -2390,7 +2391,7 @@ bool ED_transform_snap_object_project_view3d_ex( return snapObjectsRay( sctx, &snapdata, params->snap_select, params->use_object_edit_cage, - ray_depth, dist_px, r_loc, r_no, NULL, NULL); + ray_depth, dist_px, r_loc, r_no, r_ob, r_obmat); } } @@ -2408,7 +2409,8 @@ bool ED_transform_snap_object_project_view3d( params, mval, dist_px, ray_depth, - r_loc, r_no, NULL); + r_loc, r_no, NULL, + NULL, NULL); } /** -- cgit v1.2.3