diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-10 18:22:49 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-10 18:24:08 +0300 |
| commit | 825892ae7aab423124ee39524ca0278e8ba8633b (patch) | |
| tree | a384b51756622b9498a5434b67c995d714990f5a /source/blender/editors/space_clip/clip_editor.c | |
| parent | 3560e36ee93f74d2ec5f02a30381eab3e1d66e62 (diff) | |
Fix T45017: Crash when running 'track markers' operator with no clip loaded.
CLIP_OT_track_markers was missing a poll callback.
Diffstat (limited to 'source/blender/editors/space_clip/clip_editor.c')
| -rw-r--r-- | source/blender/editors/space_clip/clip_editor.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index d67c03f3622..0dc41431aeb 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -219,7 +219,10 @@ int ED_space_clip_get_clip_frame_number(SpaceClip *sc) { MovieClip *clip = ED_space_clip_get_clip(sc); - return BKE_movieclip_remap_scene_to_clip_frame(clip, sc->user.framenr); + if (clip) { + return BKE_movieclip_remap_scene_to_clip_frame(clip, sc->user.framenr); + } + return 0; } ImBuf *ED_space_clip_get_buffer(SpaceClip *sc) |