[Bf-blender-cvs] [8e0ab3d] master: Picky edits to previous commit.

[Bastien Montagne]

Commit: 8e0ab3d42f00bfa13378b5d22482b5c1e0bde892
Author: Bastien Montagne
Date:   Wed Jun 10 17:29:46 2015 +0200
Branches: master
https://developer.blender.org/rB8e0ab3d42f00bfa13378b5d22482b5c1e0bde892

Picky edits to previous commit.

===================================================================

M	source/blender/editors/space_clip/clip_editor.c
M	source/blender/editors/space_clip/tracking_ops.c

===================================================================

diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index 0dc4143..2e33260 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 5e64d87..91e11d3 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)) {