From b71c27a446407448cb19660eb1564fe1d12c8281 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 1 Jul 2015 12:47:44 +1000 Subject: Use macro for user-prefs version checks --- source/blender/editors/interface/resources.c | 146 ++++++++++++++------------- 1 file changed, 75 insertions(+), 71 deletions(-) diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 68016ae3dd8..b9d88176dba 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1584,6 +1584,8 @@ void init_userdef_do_versions(void) { Main *bmain = G.main; +#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(bmain, ver, subver) + /* the UserDef struct is not corrected with do_versions() .... ugh! */ if (U.wheellinescroll == 0) U.wheellinescroll = 3; if (U.menuthreshold1 == 0) { @@ -1624,17 +1626,17 @@ void init_userdef_do_versions(void) /* run in case this was on and is now off in the user prefs [#28096] */ vDM_ColorBand_store((U.flag & USER_CUSTOM_RANGE) ? (&U.coba_weight) : NULL, UI_GetTheme()->tv3d.vertex_unreferenced); - if (bmain->versionfile <= 191) { + if (!USER_VERSION_ATLEAST(192, 0)) { strcpy(U.sounddir, "/"); } /* patch to set Dupli Armature */ - if (bmain->versionfile < 220) { + if (!USER_VERSION_ATLEAST(220, 0)) { U.dupflag |= USER_DUP_ARM; } /* added seam, normal color, undo */ - if (bmain->versionfile <= 234) { + if (!USER_VERSION_ATLEAST(235, 0)) { bTheme *btheme; U.uiflag |= USER_GLOBALUNDO; @@ -1657,12 +1659,12 @@ void init_userdef_do_versions(void) } } } - if (bmain->versionfile <= 235) { + if (!USER_VERSION_ATLEAST(236, 0)) { /* illegal combo... */ if (U.flag & USER_LMOUSESELECT) U.flag &= ~USER_TWOBUTTONMOUSE; } - if (bmain->versionfile <= 236) { + if (!USER_VERSION_ATLEAST(237, 0)) { bTheme *btheme; /* new space type */ for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -1683,7 +1685,7 @@ void init_userdef_do_versions(void) } } } - if (bmain->versionfile <= 237) { + if (!USER_VERSION_ATLEAST(238, 0)) { bTheme *btheme; /* bone colors */ for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -1694,7 +1696,7 @@ void init_userdef_do_versions(void) } } } - if (bmain->versionfile <= 238) { + if (!USER_VERSION_ATLEAST(239, 0)) { bTheme *btheme; /* bone colors */ for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -1705,7 +1707,7 @@ void init_userdef_do_versions(void) } } } - if (bmain->versionfile <= 239) { + if (!USER_VERSION_ATLEAST(240, 0)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -1719,7 +1721,7 @@ void init_userdef_do_versions(void) } if (U.obcenter_dia == 0) U.obcenter_dia = 6; } - if (bmain->versionfile <= 241) { + if (!USER_VERSION_ATLEAST(242, 0)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { /* Node editor theme, check for alpha==0 is safe, then color was never set */ @@ -1759,7 +1761,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile <= 242) { + if (!USER_VERSION_ATLEAST(243, 0)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -1777,11 +1779,11 @@ void init_userdef_do_versions(void) } } } - if (bmain->versionfile <= 243) { + if (!USER_VERSION_ATLEAST(244, 0)) { /* set default number of recently-used files (if not set) */ if (U.recent_files == 0) U.recent_files = 10; } - if (bmain->versionfile < 245 || (bmain->versionfile == 245 && bmain->subversionfile < 3)) { + if (!USER_VERSION_ATLEAST(245, 3)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_set(btheme->tv3d.editmesh_active, 255, 255, 255, 128); @@ -1789,7 +1791,7 @@ void init_userdef_do_versions(void) if (U.coba_weight.tot == 0) init_colorband(&U.coba_weight, true); } - if ((bmain->versionfile < 245) || (bmain->versionfile == 245 && bmain->subversionfile < 11)) { + if (!USER_VERSION_ATLEAST(245, 3)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { /* these should all use the same color */ @@ -1802,7 +1804,7 @@ void init_userdef_do_versions(void) rgba_char_args_set(btheme->ttime.cframe, 0x60, 0xc0, 0x40, 255); } } - if ((bmain->versionfile < 245) || (bmain->versionfile == 245 && bmain->subversionfile < 13)) { + if (!USER_VERSION_ATLEAST(245, 3)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { /* action channel groups (recolor anyway) */ @@ -1814,10 +1816,10 @@ void init_userdef_do_versions(void) ui_theme_init_boneColorSets(btheme); } } - if ((bmain->versionfile < 245) || (bmain->versionfile == 245 && bmain->subversionfile < 16)) { + if (!USER_VERSION_ATLEAST(245, 3)) { U.flag |= USER_ADD_VIEWALIGNED | USER_ADD_EDITMODE; } - if ((bmain->versionfile < 247) || (bmain->versionfile == 247 && bmain->subversionfile <= 2)) { + if (!USER_VERSION_ATLEAST(245, 3)) { bTheme *btheme; /* adjust themes */ @@ -1839,7 +1841,7 @@ void init_userdef_do_versions(void) rgba_char_args_set(btheme->tseq.vertex_select, col[0], col[1], col[2], 255); } } - if (bmain->versionfile < 250) { + if (!USER_VERSION_ATLEAST(250, 0)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -1880,7 +1882,7 @@ void init_userdef_do_versions(void) U.ipo_new = BEZT_IPO_BEZ; } - if (bmain->versionfile < 250 || (bmain->versionfile == 250 && bmain->subversionfile < 1)) { + if (!USER_VERSION_ATLEAST(250, 1)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -1903,7 +1905,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 250 || (bmain->versionfile == 250 && bmain->subversionfile < 3)) { + if (!USER_VERSION_ATLEAST(250, 3)) { /* new audio system */ if (U.audiochannels == 0) U.audiochannels = 2; @@ -1921,10 +1923,11 @@ void init_userdef_do_versions(void) U.audiorate = 44100; } - if (bmain->versionfile < 250 || (bmain->versionfile == 250 && bmain->subversionfile < 5)) + if (!USER_VERSION_ATLEAST(250, 3)) { U.gameflags |= USER_DISABLE_VBO; + } - if (bmain->versionfile < 250 || (bmain->versionfile == 250 && bmain->subversionfile < 8)) { + if (!USER_VERSION_ATLEAST(250, 8)) { wmKeyMap *km; for (km = U.user_keymaps.first; km; km = km->next) { @@ -1964,16 +1967,16 @@ void init_userdef_do_versions(void) strcpy(km->idname, "Property Editor"); } } - if (bmain->versionfile < 250 || (bmain->versionfile == 250 && bmain->subversionfile < 16)) { + if (!USER_VERSION_ATLEAST(250, 16)) { if (U.wmdrawmethod == USER_DRAW_TRIPLE) U.wmdrawmethod = USER_DRAW_AUTOMATIC; } - if (bmain->versionfile < 252 || (bmain->versionfile == 252 && bmain->subversionfile < 3)) { + if (!USER_VERSION_ATLEAST(252, 3)) { if (U.flag & USER_LMOUSESELECT) U.flag &= ~USER_TWOBUTTONMOUSE; } - if (bmain->versionfile < 252 || (bmain->versionfile == 252 && bmain->subversionfile < 4)) { + if (!USER_VERSION_ATLEAST(252, 4)) { bTheme *btheme; /* default new handle type is auto handles */ @@ -1988,7 +1991,7 @@ void init_userdef_do_versions(void) rgba_char_args_set_fl(btheme->tv3d.edge_crease, 0.8, 0, 0.6, 1.0); } } - if (bmain->versionfile <= 252) { + if (!USER_VERSION_ATLEAST(253, 0)) { bTheme *btheme; /* init new curve colors */ @@ -1997,7 +2000,7 @@ void init_userdef_do_versions(void) rgba_char_args_set(btheme->tv3d.lastsel_point, 0xff, 0xff, 0xff, 255); } } - if (bmain->versionfile < 252 || (bmain->versionfile == 252 && bmain->subversionfile < 5)) { + if (!USER_VERSION_ATLEAST(252, 5)) { bTheme *btheme; /* interface_widgets.c */ @@ -2020,7 +2023,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 255 || (bmain->versionfile == 255 && bmain->subversionfile < 2)) { + if (!USER_VERSION_ATLEAST(255, 2)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_set(btheme->tv3d.extra_edge_len, 32, 0, 0, 255); @@ -2029,27 +2032,27 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 256 || (bmain->versionfile == 256 && bmain->subversionfile < 4)) { + if (!USER_VERSION_ATLEAST(256, 4)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { if ((btheme->tv3d.outline_width) == 0) btheme->tv3d.outline_width = 1; } } - if (bmain->versionfile < 257) { + if (!USER_VERSION_ATLEAST(257, 0)) { /* clear "AUTOKEY_FLAG_ONLYKEYINGSET" flag from userprefs, * so that it doesn't linger around from old configs like a ghost */ U.autokey_flag &= ~AUTOKEY_FLAG_ONLYKEYINGSET; } - if (bmain->versionfile < 258 || (bmain->versionfile == 258 && bmain->subversionfile < 2)) { + if (!USER_VERSION_ATLEAST(258, 2)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { btheme->tnode.noodle_curving = 5; } } - if (bmain->versionfile < 259 || (bmain->versionfile == 259 && bmain->subversionfile < 1)) { + if (!USER_VERSION_ATLEAST(259, 1)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -2057,7 +2060,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 260 || (bmain->versionfile == 260 && bmain->subversionfile < 3)) { + if (!USER_VERSION_ATLEAST(260, 3)) { bTheme *btheme; /* if new keyframes handle default is stuff "auto", make it "auto-clamped" instead @@ -2106,7 +2109,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 260 || (bmain->versionfile == 260 && bmain->subversionfile < 5)) { + if (!USER_VERSION_ATLEAST(260, 5)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -2115,7 +2118,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 261 || (bmain->versionfile == 261 && bmain->subversionfile < 4)) { + if (!USER_VERSION_ATLEAST(261, 4)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_set_fl(btheme->tima.preview_stitch_face, 0.071, 0.259, 0.694, 0.150); @@ -2132,7 +2135,7 @@ void init_userdef_do_versions(void) U.use_16bit_textures = true; } - if (bmain->versionfile < 262 || (bmain->versionfile == 262 && bmain->subversionfile < 2)) { + if (!USER_VERSION_ATLEAST(262, 2)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { if (btheme->tui.wcol_menu_item.item[3] == 255) @@ -2140,7 +2143,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 262 || (bmain->versionfile == 262 && bmain->subversionfile < 3)) { + if (!USER_VERSION_ATLEAST(262, 3)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { if (btheme->tui.wcol_tooltip.inner[3] == 0) { @@ -2152,7 +2155,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 262 || (bmain->versionfile == 262 && bmain->subversionfile < 4)) { + if (!USER_VERSION_ATLEAST(262, 4)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { if (btheme->tseq.movieclip[3] == 0) { @@ -2161,7 +2164,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 2)) { + if (!USER_VERSION_ATLEAST(263, 2)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { if (btheme->tclip.strip[0] == 0) { @@ -2172,13 +2175,13 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 6)) { + if (!USER_VERSION_ATLEAST(263, 6)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) rgba_char_args_set(btheme->tv3d.skin_root, 180, 77, 77, 255); } - if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 7)) { + if (!USER_VERSION_ATLEAST(263, 7)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -2201,7 +2204,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 11)) { + if (!USER_VERSION_ATLEAST(263, 11)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { if (btheme->tseq.mask[3] == 0) { @@ -2210,14 +2213,14 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 15)) { + if (!USER_VERSION_ATLEAST(263, 15)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_set(btheme->tv3d.bone_pose_active, 140, 255, 255, 80); } } - if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 16)) { + if (!USER_VERSION_ATLEAST(263, 16)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -2229,7 +2232,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 22)) { + if (!USER_VERSION_ATLEAST(263, 22)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -2241,7 +2244,7 @@ void init_userdef_do_versions(void) } } - if (bmain->versionfile < 264 || (bmain->versionfile == 264 && bmain->subversionfile < 9)) { + if (!USER_VERSION_ATLEAST(264, 9)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -2251,7 +2254,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 267) { + if (!USER_VERSION_ATLEAST(267, 0)) { /* Freestyle color settings */ bTheme *btheme; @@ -2310,7 +2313,7 @@ void init_userdef_do_versions(void) U.tweak_threshold = 10; } - if (bmain->versionfile < 265 || (bmain->versionfile == 265 && bmain->subversionfile < 1)) { + if (!USER_VERSION_ATLEAST(265, 1)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -2326,7 +2329,7 @@ void init_userdef_do_versions(void) } /* panel header/backdrop supported locally per editor now */ - if (bmain->versionfile < 265 || (bmain->versionfile == 265 && bmain->subversionfile < 2)) { + if (!USER_VERSION_ATLEAST(265, 2)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -2343,7 +2346,10 @@ void init_userdef_do_versions(void) } /* NOTE!! from now on use U.versionfile and U.subversionfile */ - if (U.versionfile < 266) { +#undef USER_VERSION_ATLEAST +#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST((&(U)), ver, subver) + + if (!USER_VERSION_ATLEAST(266, 0)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { @@ -2355,7 +2361,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 265 || (U.versionfile == 265 && U.subversionfile < 4)) { + if (!USER_VERSION_ATLEAST(265, 4)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_set(btheme->text.syntaxd, 50, 0, 140, 255); /* Decorator/Preprocessor Dir. Blue-purple */ @@ -2364,14 +2370,14 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 265 || (U.versionfile == 265 && U.subversionfile < 6)) { + if (!USER_VERSION_ATLEAST(265, 6)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { copy_v4_v4_char(btheme->tv3d.gradients.high_gradient, btheme->tv3d.back); } } - if (U.versionfile < 265 || (U.versionfile == 265 && U.subversionfile < 9)) { + if (!USER_VERSION_ATLEAST(265, 9)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_test_set(btheme->tnode.syntaxs, 151, 116, 116, 255); /* matte nodes */ @@ -2379,23 +2385,21 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 265 || (U.versionfile == 265 && U.subversionfile < 11)) { + if (!USER_VERSION_ATLEAST(265, 11)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_test_set(btheme->tconsole.console_select, 255, 255, 255, 48); } } - if (U.versionfile < 266 || (U.versionfile == 266 && U.subversionfile < 2)) { + if (!USER_VERSION_ATLEAST(266, 2)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_test_set(btheme->tnode.console_output, 223, 202, 53, 255); /* interface nodes */ } } - /* NOTE!! from now on use U.versionfile and U.subversionfile */ - - if (U.versionfile < 268 || (U.versionfile == 268 && U.subversionfile < 3)) { + if (!USER_VERSION_ATLEAST(268, 3)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_test_set(btheme->tima.uv_others, 96, 96, 96, 255); @@ -2403,7 +2407,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 269 || (U.versionfile == 269 && U.subversionfile < 5)) { + if (!USER_VERSION_ATLEAST(269, 5)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_set(btheme->tima.wire_edit, 192, 192, 192, 255); @@ -2411,7 +2415,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 269 || (U.versionfile == 269 && U.subversionfile < 6)) { + if (!USER_VERSION_ATLEAST(269, 6)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { char r, g, b; @@ -2432,7 +2436,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 269 || (U.versionfile == 269 && U.subversionfile < 8)) { + if (!USER_VERSION_ATLEAST(269, 8)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_test_set(btheme->tinfo.info_selected, 96, 128, 255, 255); @@ -2448,7 +2452,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 269 || (U.versionfile == 269 && U.subversionfile < 9)) { + if (!USER_VERSION_ATLEAST(269, 9)) { bTheme *btheme; U.tw_size = U.tw_size * 5.0f; @@ -2488,7 +2492,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 269 || (U.versionfile == 269 && U.subversionfile < 10)) { + if (!USER_VERSION_ATLEAST(269, 10)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { ThemeSpace *ts; @@ -2502,14 +2506,14 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 271) { + if (!USER_VERSION_ATLEAST(271, 0)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_set(btheme->tui.wcol_tooltip.text, 255, 255, 255, 255); } } - if (U.versionfile < 272 || (U.versionfile == 272 && U.subversionfile < 2)) { + if (!USER_VERSION_ATLEAST(272, 2)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_set_fl(btheme->tv3d.paint_curve_handle, 0.5f, 1.0f, 0.5f, 0.5f); @@ -2520,7 +2524,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 271 || (U.versionfile == 271 && U.subversionfile < 5)) { + if (!USER_VERSION_ATLEAST(271, 5)) { bTheme *btheme; struct uiWidgetColors wcol_pie_menu = { @@ -2550,7 +2554,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 271 || (U.versionfile == 271 && U.subversionfile < 6)) { + if (!USER_VERSION_ATLEAST(271, 6)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { /* check for (alpha == 0) is safe, then color was never set */ @@ -2560,14 +2564,14 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 272 || (U.versionfile == 272 && U.subversionfile < 3)) { + if (!USER_VERSION_ATLEAST(272, 3)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { rgba_char_args_set_fl(btheme->tui.widget_emboss, 1.0f, 1.0f, 1.0f, 0.02f); } } - if (U.versionfile < 273 || (U.versionfile == 273 && U.subversionfile < 1)) { + if (!USER_VERSION_ATLEAST(273, 1)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { /* Grease Pencil vertex settings */ @@ -2593,7 +2597,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 273 || (U.versionfile == 273 && U.subversionfile < 5)) { + if (!USER_VERSION_ATLEAST(273, 5)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { unsigned char *cp = (unsigned char *)btheme->tv3d.clipping_border_3d; @@ -2612,7 +2616,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 274 || (U.versionfile == 274 && U.subversionfile < 5)) { + if (!USER_VERSION_ATLEAST(274, 5)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { copy_v4_v4_char(btheme->tima.metadatatext, btheme->tima.text_hi); @@ -2620,7 +2624,7 @@ void init_userdef_do_versions(void) } } - if (U.versionfile < 275 || (U.versionfile == 275 && U.subversionfile < 1)) { + if (!USER_VERSION_ATLEAST(275, 1)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { copy_v4_v4_char(btheme->tclip.metadatatext, btheme->tseq.text_hi); -- cgit v1.2.3