[Bf-blender-cvs] [5c2d7f7] blender-v2.71: Set BLENDER_VERSION_CYCLE to release

Campbell Barton noreply at git.blender.org
Wed Jun 25 16:18:28 CEST 2014


Commit: 5c2d7f76a60fba00ccbfad48c387261341e8049e
Author: Campbell Barton
Date:   Thu Jun 26 00:17:34 2014 +1000
https://developer.blender.org/rB5c2d7f76a60fba00ccbfad48c387261341e8049e

Set BLENDER_VERSION_CYCLE to release

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

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

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

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index 0a692af..be02f01 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -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   rc
+#define BLENDER_VERSION_CYCLE   release
 
 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 aa27c47..69e869f 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1828,7 +1828,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 (1) {
+	if (0) {
 		/* placed after the version number in the image,
 		 * placing y is tricky to match baseline */
 		int x = 260 - (2 * UI_DPI_WINDOW_FAC);




More information about the Bf-blender-cvs mailing list