Page MenuHome
Differential D829 Diff 2743 source/blender/editors/interface/resources.c

Changeset View

Standalone View

View Options

source/blender/editors/interface/resources.c

Show First 20 Lines • Show All 613 Lines • ▼ Show 20 Lines else {
break; break;
case TH_NLA_SOUND: case TH_NLA_SOUND:
cp = ts->nla_sound; cp = ts->nla_sound;
break; break;
case TH_NLA_SOUND_SEL: case TH_NLA_SOUND_SEL:
cp = ts->nla_sound_sel; cp = ts->nla_sound_sel;
break; break;
case TH_EMBOSS:
cp = btheme->tui.emboss; break;
case TH_AXIS_X: case TH_AXIS_X:
cp = btheme->tui.xaxis; break; cp = btheme->tui.xaxis; break;
case TH_AXIS_Y: case TH_AXIS_Y:
cp = btheme->tui.yaxis; break; cp = btheme->tui.yaxis; break;
case TH_AXIS_Z: case TH_AXIS_Z:
cp = btheme->tui.zaxis; break; cp = btheme->tui.zaxis; break;
case TH_INFO_SELECTED: case TH_INFO_SELECTED:
▲ Show 20 Lines • Show All 180 Lines • ▼ Show 20 Linesvoid ui_theme_init_default(void)
/* UI buttons */ /* UI buttons */
ui_widget_color_init(&btheme->tui); ui_widget_color_init(&btheme->tui);
btheme->tui.iconfile[0] = 0; btheme->tui.iconfile[0] = 0;
btheme->tui.panel.show_back = false; btheme->tui.panel.show_back = false;
btheme->tui.panel.show_header = false; btheme->tui.panel.show_header = false;
rgba_char_args_set(btheme->tui.panel.header, 0, 0, 0, 25); rgba_char_args_set(btheme->tui.panel.header, 0, 0, 0, 25);
rgba_char_args_set_fl(btheme->tui.emboss, 1.0f, 1.0f, 1.0f, 0.02f);
rgba_char_args_set(btheme->tui.xaxis, 220, 0, 0, 255); rgba_char_args_set(btheme->tui.xaxis, 220, 0, 0, 255);
rgba_char_args_set(btheme->tui.yaxis, 0, 220, 0, 255); rgba_char_args_set(btheme->tui.yaxis, 0, 220, 0, 255);
rgba_char_args_set(btheme->tui.zaxis, 0, 0, 220, 255); rgba_char_args_set(btheme->tui.zaxis, 0, 0, 220, 255);
btheme->tui.menu_shadow_fac = 0.5f; btheme->tui.menu_shadow_fac = 0.5f;
btheme->tui.menu_shadow_width = 12; btheme->tui.menu_shadow_width = 12;
/* Bone Color Sets */ /* Bone Color Sets */
▲ Show 20 Lines • Show All 1,660 Lines • ▼ Show 20 Lines if (U.versionfile < 271 || (U.versionfile == 271 && U.subversionfile < 6)) {
for (btheme = U.themes.first; btheme; btheme = btheme->next) { for (btheme = U.themes.first; btheme; btheme = btheme->next) {
/* check for (alpha == 0) is safe, then color was never set */ /* check for (alpha == 0) is safe, then color was never set */
if (btheme->tv3d.loop_normal[3] == 0) { if (btheme->tv3d.loop_normal[3] == 0) {
rgba_char_args_set(btheme->tv3d.loop_normal, 0xDD, 0x23, 0xDD, 255); rgba_char_args_set(btheme->tv3d.loop_normal, 0xDD, 0x23, 0xDD, 255);
} }
} }
} }
if (U.versionfile < 272 || (U.versionfile == 272 && U.subversionfile < 1)) {
kevindietrichUnsubmitted
Not Done
Inline Actions

I believe you should do the version bump here with "U.subversionfile < 2" instead of "U.subversionfile < 1".
In this case there's already such a loop line 2443.

kevindietrich: I believe you should do the version bump here with "U.subversionfile < 2" instead of "U.
bTheme *btheme;
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
rgba_char_args_set_fl(btheme->tui.emboss, 1.0f, 1.0f, 1.0f, 0.02f);
}
}
if (U.pixelsize == 0.0f) if (U.pixelsize == 0.0f)
U.pixelsize = 1.0f; U.pixelsize = 1.0f;
if (U.image_draw_method == 0) if (U.image_draw_method == 0)
U.image_draw_method = IMAGE_DRAW_METHOD_2DTEXTURE; U.image_draw_method = IMAGE_DRAW_METHOD_2DTEXTURE;
/* funny name, but it is GE stuff, moves userdef stuff to engine */ /* funny name, but it is GE stuff, moves userdef stuff to engine */
// XXX space_set_commmandline_options(); // XXX space_set_commmandline_options();
/* this timer uses U */ /* this timer uses U */
// XXX reset_autosave(); // XXX reset_autosave();
} }