[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46078] branches/soc-2011-tomato/source/ blender/editors: Tomato branch: correction to dopesheet background color versioning check

[Sergey Sharybin]

Revision: 46078
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46078
Author:   nazgul
Date:     2012-04-29 15:30:54 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Tomato branch: correction to dopesheet background color versioning check

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/interface/resources.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_draw.c

Modified: branches/soc-2011-tomato/source/blender/editors/interface/resources.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/resources.c	2012-04-29 15:05:19 UTC (rev 46077)
+++ branches/soc-2011-tomato/source/blender/editors/interface/resources.c	2012-04-29 15:30:54 UTC (rev 46078)
@@ -1778,7 +1778,7 @@
 		}
 	}
 
-	if (bmain->versionfile < 262 || (bmain->versionfile == 262 && bmain->subversionfile < 5)) {
+	{
 		bTheme *btheme;
 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
 			if (btheme->tclip.strip[0] == 0) {

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_draw.c	2012-04-29 15:05:19 UTC (rev 46077)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_draw.c	2012-04-29 15:30:54 UTC (rev 46078)
@@ -194,7 +194,7 @@
 					track_channel_color(track, default_color, color);
 					glColor4fv(color);
 
-					glRectf(v2d->cur.xmin, (float)y - CHANNEL_HEIGHT_HALF,
+					glRectf(v2d->cur.xmin, (float) y - CHANNEL_HEIGHT_HALF,
 					        v2d->cur.xmax + EXTRA_SCROLL_PAD, (float) y + CHANNEL_HEIGHT_HALF);
 				}
 
@@ -228,7 +228,7 @@
 						else
 							glColor4fv(strip);
 
-						glRectf(start_marker->framenr, (float)y - STRIP_HEIGHT_HALF,
+						glRectf(start_marker->framenr, (float) y - STRIP_HEIGHT_HALF,
 						        start_marker->framenr + len, (float) y + STRIP_HEIGHT_HALF);
 
 						draw_keyframe_shape(start_marker->framenr, y, xscale, yscale, sel, alpha);
@@ -318,7 +318,7 @@
 			track_channel_color(track, NULL, color);
 			glColor3fv(color);
 
-			glRectf(v2d->cur.xmin, (float)y - CHANNEL_HEIGHT_HALF,
+			glRectf(v2d->cur.xmin, (float) y - CHANNEL_HEIGHT_HALF,
 			        v2d->cur.xmax + EXTRA_SCROLL_PAD, (float) y + CHANNEL_HEIGHT_HALF);
 
 			if (sel)