[Bf-blender-cvs] [43d1bfea404] blender-v2.79a-release: Blender 2.79a: Show both version char and rc text on splash

[Sergey Sharybin]

Commit: 43d1bfea404dff71a6ffaed933cc6e6f245d1b4e
Author: Sergey Sharybin
Date:   Mon Jan 22 14:41:22 2018 +0100
Branches: blender-v2.79a-release
https://developer.blender.org/rB43d1bfea404dff71a6ffaed933cc6e6f245d1b4e

Blender 2.79a: Show both version char and rc text on splash

===================================================================

M	source/blender/blenkernel/BKE_blender_version.h
M	source/blender/windowmanager/intern/wm_operators.c

===================================================================

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);