diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-06 16:56:09 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-06 16:56:09 +0300 |
commit | 84474b0171eba502cbde345ce44707ba6dde7203 (patch) | |
tree | b6f229d519657d20508bf10ab053083c3bc6d4aa /source/blender/editors/transform/transform_snap_object.c | |
parent | 632f2b5c18310760f61f7a998ff972cde0ac49d6 (diff) |
Object Snap: add object & matrix to view ray cast
Some snap functions already exposed this.
Diffstat (limited to 'source/blender/editors/transform/transform_snap_object.c')
-rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 10 |
1 files changed, 6 insertions, 4 deletions
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); } /** |