diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-10 18:29:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-10 18:29:46 +0300 |
| commit | 8e0ab3d42f00bfa13378b5d22482b5c1e0bde892 (patch) | |
| tree | 69a8baed19263bed7238e79bcf07f62989b2c40c | |
| parent | 825892ae7aab423124ee39524ca0278e8ba8633b (diff) | |
Picky edits to previous commit.
| -rw-r--r-- | source/blender/editors/space_clip/clip_editor.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 0dc41431aeb..2e3326000ca 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -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) diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 5e64d87facd..91e11d30cc2 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -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)) { |