forked from bartvdbraak/blender
Tracking: Cleanup, use more const qualifiers when appropriate
This commit is contained in:
parent
c4046e9082
commit
4cc0f09881
@ -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);
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user