From 4cc0f09881174467f63f33ed16a5c6d6dfadeed3 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 15 Dec 2017 12:23:35 +0100 Subject: Tracking: Cleanup, use more const qualifiers when appropriate --- source/blender/blenkernel/BKE_movieclip.h | 4 ++-- source/blender/blenkernel/intern/movieclip.c | 4 ++-- source/blender/blenkernel/intern/tracking_auto.c | 10 ++++------ 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_movieclip.h b/source/blender/blenkernel/BKE_movieclip.h index 0bdff3eb795..bd193b82b9e 100644 --- a/source/blender/blenkernel/BKE_movieclip.h +++ b/source/blender/blenkernel/BKE_movieclip.h @@ -74,8 +74,8 @@ void BKE_movieclip_build_proxy_frame(struct MovieClip *clip, int clip_flag, stru void BKE_movieclip_build_proxy_frame_for_ibuf(struct MovieClip *clip, struct ImBuf *ibuf, struct MovieDistortion *distortion, int cfra, int *build_sizes, int build_count, bool undistorted); -float BKE_movieclip_remap_scene_to_clip_frame(struct MovieClip *clip, float framenr); -float BKE_movieclip_remap_clip_to_scene_frame(struct MovieClip *clip, float framenr); +float BKE_movieclip_remap_scene_to_clip_frame(const struct MovieClip *clip, float framenr); +float BKE_movieclip_remap_clip_to_scene_frame(const struct MovieClip *clip, float framenr); void BKE_movieclip_filename_for_frame(struct MovieClip *clip, struct MovieClipUser *user, char *name); struct ImBuf *BKE_movieclip_anim_ibuf_for_frame(struct MovieClip *clip, struct MovieClipUser *user); diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index db05939b1cc..08df976941b 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -1524,12 +1524,12 @@ void BKE_movieclip_make_local(Main *bmain, MovieClip *clip, const bool lib_local BKE_id_make_local_generic(bmain, &clip->id, true, lib_local); } -float BKE_movieclip_remap_scene_to_clip_frame(MovieClip *clip, float framenr) +float BKE_movieclip_remap_scene_to_clip_frame(const MovieClip *clip, float framenr) { return framenr - (float) clip->start_frame + 1.0f; } -float BKE_movieclip_remap_clip_to_scene_frame(MovieClip *clip, float framenr) +float BKE_movieclip_remap_clip_to_scene_frame(const MovieClip *clip, float framenr) { return framenr + (float) clip->start_frame - 1.0f; } diff --git a/source/blender/blenkernel/intern/tracking_auto.c b/source/blender/blenkernel/intern/tracking_auto.c index 4ff4a129768..2120e730eab 100644 --- a/source/blender/blenkernel/intern/tracking_auto.c +++ b/source/blender/blenkernel/intern/tracking_auto.c @@ -236,17 +236,15 @@ static void libmv_marker_to_dna_marker(libmv_Marker *libmv_marker, } } -static bool check_track_trackable(MovieClip *clip, +static bool check_track_trackable(const MovieClip *clip, MovieTrackingTrack *track, - MovieClipUser *user) + const MovieClipUser *user) { if (TRACK_SELECTED(track) && (track->flag & (TRACK_LOCKED | TRACK_HIDDEN)) == 0) { - MovieTrackingMarker *marker; - int frame; - frame = BKE_movieclip_remap_scene_to_clip_frame(clip, user->framenr); - marker = BKE_tracking_marker_get(track, frame); + int frame = BKE_movieclip_remap_scene_to_clip_frame(clip, user->framenr); + const MovieTrackingMarker *marker = BKE_tracking_marker_get(track, frame); return (marker->flag & MARKER_DISABLED) == 0; } return false; -- cgit v1.2.3