Maintenance: Start of 2.71 release cycle, BCon1, Alpha.

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index d35ff80265fea19469dcb5eadaecd40971d9236c..415a912d666cb234c63ca39fd6ac344c36c5494b 100644 (file)
--- 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   alpha
 
 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 29ba7b09e5c3049f61a02a9d33770e93792849e4..a30a88152302d4653184b15ab0b4b39c4efbef7e 100644 (file)
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1816,7 +1816,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);
@@ -1825,7 +1825,6 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
 
                const char *version_suffix = "Release Candidate";
 
-
                /* hack to have text draw 'text_sel' */
                uiBlockSetEmboss(block, UI_EMBOSSN);
                but = uiDefBut(block, LABEL, 0, version_suffix, x * U.pixelsize, y * U.pixelsize, w * U.pixelsize, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);