Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-12-21 18:26:23 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-12-21 18:26:23 +0400
commitb9d732e0472388460880c26ff4d503daac374ab1 (patch)
tree0a2de2ac759f125ae116cb92688830907715fcc0 /source/blender/editors/space_clip/clip_draw.c
parent9bd3a226aec3404c05c4d92eeb669b358a901fba (diff)
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.
Diffstat (limited to 'source/blender/editors/space_clip/clip_draw.c')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index c029ced5688..983858ac568 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 */