diff options
| author | mano-wii <germano.costa@ig.com.br> | 2017-07-11 19:54:08 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2017-07-11 19:54:08 +0300 |
| commit | 538475dec7585bb77f57215e722f5b6762907d51 (patch) | |
| tree | 7708fa2b90ef82d302e74ff894a10f0a95bbe237 /source/blender/editors/include | |
| parent | 11ee5aa4f9b60ddb7597b65926c125d5536863ca (diff) | |
| parent | dd1edb0954b5441255b5a3616841228f466e448e (diff) | |
Merge branch 'master' of git@git.blender.org:blender.git into blender2.8
# Conflicts:
# source/blender/editors/transform/transform_snap_object.c
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_transform_snap_object_context.h | 2 |
1 files changed, 0 insertions, 2 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 010f7929e90..1bc22e79625 100644 --- a/source/blender/editors/include/ED_transform_snap_object_context.h +++ b/source/blender/editors/include/ED_transform_snap_object_context.h @@ -85,7 +85,6 @@ void ED_transform_snap_object_context_set_editmesh_callbacks( bool ED_transform_snap_object_project_ray_ex( struct SnapObjectContext *sctx, - const unsigned short snap_to, const struct SnapObjectParams *params, const float ray_start[3], const float ray_normal[3], float *ray_depth, /* return args */ @@ -99,7 +98,6 @@ bool ED_transform_snap_object_project_ray( bool ED_transform_snap_object_project_ray_all( SnapObjectContext *sctx, - const unsigned short snap_to, const struct SnapObjectParams *params, const float ray_start[3], const float ray_normal[3], float ray_depth, bool sort, |