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/blenderplayer | |
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/blenderplayer')
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index e31337b9c96..13f567762b5 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -610,7 +610,6 @@ SnapObjectContext *ED_transform_snap_object_context_create_view3d( void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) RET_NONE 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 */ |