griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tomato branch: correction to dopesheet background color versioning check

Browse Source
This commit is contained in:
Sergey Sharybin
2012-04-29 15:30:54 +00:00
parent a18e18264b
commit f8e134db13
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/resources.c
View File

@@ -1778,7 +1778,7 @@ void init_userdef_do_versions(void)
}
}
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) {

6
source/blender/editors/space_clip/clip_dopesheet_draw.c
View File

@@ -194,7 +194,7 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
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 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
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 @@ void clip_draw_dopesheet_channels(const bContext *C, ARegion *ar)
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)