diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-06 17:00:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-06 17:00:27 +0300 |
| commit | 541258bfa60e90ff6c0b89ed2972963a9f53db86 (patch) | |
| tree | 4b3bd64253a9ad25990ead29b3b361b817dee0e3 /source/blender/editors/include/ED_transform_snap_object_context.h | |
| parent | f28d209591d712b5c25051d3e5aea7b293b9f059 (diff) | |
| parent | 84474b0171eba502cbde345ce44707ba6dde7203 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include/ED_transform_snap_object_context.h')
| -rw-r--r-- | source/blender/editors/include/ED_transform_snap_object_context.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 3d778527a59..f1d47911cdd 100644 --- a/source/blender/editors/include/ED_transform_snap_object_context.h +++ b/source/blender/editors/include/ED_transform_snap_object_context.h @@ -117,7 +117,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, |