From 43d1bfea404dff71a6ffaed933cc6e6f245d1b4e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 22 Jan 2018 14:41:22 +0100 Subject: Blender 2.79a: Show both version char and rc text on splash --- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/windowmanager/intern/wm_operators.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 91fa441e662..288dc636a93 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -37,7 +37,7 @@ /* can be left blank, otherwise a,b,c... etc with no quotes */ #define BLENDER_VERSION_CHAR a /* alpha/beta/rc/release, docs use this */ -#define BLENDER_VERSION_CYCLE release +#define BLENDER_VERSION_CYCLE rc extern char versionstr[]; /* from blender.c */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 9d48fd8649f..bed6a73c346 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1810,7 +1810,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar /* label for 'a' bugfix releases, or 'Release Candidate 1'... * avoids recreating splash for version updates */ if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "rc")) { - version_suffix = "Release Candidate 2"; + version_suffix = STRINGIFY(BLENDER_VERSION_CHAR) " Release Candidate"; } else if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "release")) { version_suffix = STRINGIFY(BLENDER_VERSION_CHAR); -- cgit v1.2.3