diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-29 18:58:39 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-29 18:58:39 +0300 |
commit | 71a57a37b2eebbed53b5335019287b4df9c30519 (patch) | |
tree | 2f7add7d48c7419e0dc2d8909a622f6075d62800 /source | |
parent | f45fbf4b8375d45e61d043f6f2f9ddfd2bcc5fae (diff) | |
parent | 94a80a1fb117a93c0143f990332cec1233e14b94 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 863a2636a94..37e9c7eae7a 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -519,7 +519,7 @@ SnapObjectContext *ED_transform_snap_object_context_create( struct Main *bmain, struct Scene *scene, int flag) RET_NULL SnapObjectContext *ED_transform_snap_object_context_create_view3d( struct Main *bmain, struct Scene *scene, int flag, - struct ARegion *ar, struct View3D *v3d) RET_NULL + const struct ARegion *ar, const struct View3D *v3d) RET_NULL void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) RET_NONE bool ED_transform_snap_object_project_ray_ex( struct SnapObjectContext *sctx, |