Picky edits to previous commit.

This commit is contained in:
Bastien Montagne 2015-06-10 17:29:46 +02:00
parent 825892ae7a
commit 8e0ab3d42f
2 changed files with 3 additions and 5 deletions

View File

@ -219,10 +219,8 @@ int ED_space_clip_get_clip_frame_number(SpaceClip *sc)
{
MovieClip *clip = ED_space_clip_get_clip(sc);
if (clip) {
return BKE_movieclip_remap_scene_to_clip_frame(clip, sc->user.framenr);
}
return 0;
/* Caller must ensure space does have a valid clip, otherwise it will crash, see T45017. */
return BKE_movieclip_remap_scene_to_clip_frame(clip, sc->user.framenr);
}
ImBuf *ED_space_clip_get_buffer(SpaceClip *sc)

View File

@ -1426,7 +1426,7 @@ static int track_markers_invoke(bContext *C, wmOperator *op, const wmEvent *UNUS
}
clip = ED_space_clip_get_clip(sc);
BLI_assert(clip);
BLI_assert(clip != NULL);
framenr = ED_space_clip_get_clip_frame_number(sc);
if (WM_jobs_test(CTX_wm_manager(C), sa, WM_JOB_TYPE_ANY)) {