[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42461] branches/soc-2011-tomato: Merging r42458 through r42460 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 42461
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42461
Author:   nazgul
Date:     2011-12-06 12:07:37 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
Merging r42458 through r42460 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42458
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42460

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42457
   + /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42460

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c	2011-12-06 12:04:39 UTC (rev 42460)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c	2011-12-06 12:07:37 UTC (rev 42461)
@@ -236,6 +236,7 @@
 
 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 @@
 	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);


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-42457
   + /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-42460