[Bf-blender-cvs] [b9d732e] master: Fix T37907: Crash when change screen layout to "Motion Tracking"

[Sergey Sharybin]

Commit: b9d732e0472388460880c26ff4d503daac374ab1
Author: Sergey Sharybin
Date:   Sat Dec 21 20:26:23 2013 +0600
http://developer.blender.org/rBb9d732e0472388460880c26ff4d503daac374ab1

Fix T37907: Crash when change screen layout to "Motion Tracking"

Was a bug in recent change from my own.

Also fixed cache line being displayed twice.

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

M	source/blender/editors/space_clip/clip_draw.c

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

diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index c029ced..983858a 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -1795,17 +1795,16 @@ void clip_draw_main(const bContext *C, SpaceClip *sc, ARegion *ar)
 		draw_tracking_tracks(sc, scene, ar, clip, width, height, zoomx, zoomy);
 		draw_distortion(sc, ar, clip, width, height, zoomx, zoomy);
 	}
-
-	draw_movieclip_cache(sc, ar, clip, scene);
-	draw_movieclip_notes(sc, ar);
 }
 
 void clip_draw_cache_and_notes(const bContext *C, SpaceClip *sc, ARegion *ar)
 {
 	Scene *scene = CTX_data_scene(C);
 	MovieClip *clip = ED_space_clip_get_clip(sc);
-	draw_movieclip_cache(sc, ar, clip, scene);
-	draw_movieclip_notes(sc, ar);
+	if (clip) {
+		draw_movieclip_cache(sc, ar, clip, scene);
+		draw_movieclip_notes(sc, ar);
+	}
 }
 
 /* draw grease pencil */