diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-06 16:07:37 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-06 16:07:37 +0400 |
commit | 0c55c3d13cb96ac9b9da9c09ca1987cdd61d1bed (patch) | |
tree | f01a8037df6d426a2b3afac2ccdf6cb6b73443eb | |
parent | 6ac2bb8b9480de3a308ca320b7c0de123e49a5af (diff) | |
parent | fca9c231a0a798bbb0ba2f65c61adcc668f93eb1 (diff) |
Merging r42458 through r42460 from trunk into soc-2011-tomato
-rw-r--r-- | source/blender/editors/space_clip/clip_graph_draw.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c index d1e7c86d473..93aba356c9a 100644 --- a/source/blender/editors/space_clip/clip_graph_draw.c +++ b/source/blender/editors/space_clip/clip_graph_draw.c @@ -236,6 +236,7 @@ static void draw_frame_curves(SpaceClip *sc) void clip_draw_graph(SpaceClip *sc, ARegion *ar, Scene *scene) { + MovieClip *clip= ED_space_clip(sc); View2D *v2d= &ar->v2d; View2DGrid *grid; short unitx= V2D_UNIT_FRAMESCALE, unity= V2D_UNIT_VALUES; @@ -245,11 +246,13 @@ void clip_draw_graph(SpaceClip *sc, ARegion *ar, Scene *scene) UI_view2d_grid_draw(v2d, grid, V2D_GRIDLINES_ALL); UI_view2d_grid_free(grid); - if(sc->flag&SC_SHOW_GRAPH_TRACKS) - draw_tracks_curves(v2d, sc); + if(clip) { + if(sc->flag&SC_SHOW_GRAPH_TRACKS) + draw_tracks_curves(v2d, sc); - if(sc->flag&SC_SHOW_GRAPH_FRAMES) - draw_frame_curves(sc); + if(sc->flag&SC_SHOW_GRAPH_FRAMES) + draw_frame_curves(sc); + } /* current frame */ draw_graph_cfra(sc, ar, scene); |