archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Tracking, reduce indentation level

Browse Source
This commit is contained in:
Sergey Sharybin
2021-02-22 15:45:09 +01:00
parent da5eed7ee6
commit dec73ed409
1 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenkernel/intern/movieclip.c
View File

@@ -1728,12 +1728,19 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
scopes->track = NULL; scopes->track = NULL;
scopes->track_locked = true; scopes->track_locked = true;
if (clip) { scopes->framenr = user->framenr;
MovieTrackingTrack *act_track = BKE_tracking_track_get_active(&clip->tracking); scopes->ok = true;
if (act_track) { if (clip == NULL) {
MovieTrackingTrack *track = act_track; return;
int framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, user->framenr); }
MovieTrackingTrack *track = BKE_tracking_track_get_active(&clip->tracking);
if (track == NULL) {
return;
}
const int framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, user->framenr);
MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr); MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
scopes->marker = marker; scopes->marker = marker;
@@ -1794,11 +1801,6 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
scopes->slide_scale[1] = pat_max[1] - pat_min[1]; scopes->slide_scale[1] = pat_max[1] - pat_min[1];
} }
} }
}
scopes->framenr = user->framenr;
scopes->ok = true;
}
static void movieclip_build_proxy_ibuf( static void movieclip_build_proxy_ibuf(
MovieClip *clip, ImBuf *ibuf, int cfra, int proxy_render_size, bool undistorted, bool threaded) MovieClip *clip, ImBuf *ibuf, int cfra, int proxy_render_size, bool undistorted, bool threaded)