diff options
-rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 6 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index e7060e64d2a..5c91d42babd 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -41,8 +41,8 @@ extern "C" { /* these lines are grep'd, watch out for our not-so-awesome regex * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ -#define BLENDER_VERSION 276 -#define BLENDER_SUBVERSION 11 +#define BLENDER_VERSION 277 +#define BLENDER_SUBVERSION 0 /* Several breakages with 270, e.g. constraint deg vs rad */ #define BLENDER_MINVERSION 270 #define BLENDER_MINSUBVERSION 6 @@ -51,7 +51,7 @@ extern "C" { /* can be left blank, otherwise a,b,c... etc with no quotes */ #define BLENDER_VERSION_CHAR /* alpha/beta/rc/release, docs use this */ -#define BLENDER_VERSION_CYCLE alpha +#define BLENDER_VERSION_CYCLE rc extern char versionstr[]; /* from blender.c */ diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index c23df5cf010..b1d2e329da1 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -2694,12 +2694,7 @@ void init_userdef_do_versions(void) } } - /** - * Include next version bump. - * - * (keep this block even if it becomes empty). - */ - { + if (!USER_VERSION_ATLEAST(277, 0)) { bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { if (memcmp(btheme->tui.wcol_list_item.item, btheme->tui.wcol_list_item.text_sel, sizeof(char) * 3) == 0) { @@ -2709,6 +2704,14 @@ void init_userdef_do_versions(void) } } + /** + * Include next version bump. + * + * (keep this block even if it becomes empty). + */ + { + } + if (U.pixelsize == 0.0f) U.pixelsize = 1.0f; |