diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-03-07 16:43:39 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-03-07 16:43:59 +0400 |
| commit | e097c987a8a55f2eb09c19ceac923e7c32e19d89 (patch) | |
| tree | a4bb8a065aaef39f89a3fb3ff9bf9ff1d3f8779a /source/blender | |
| parent | 43b5f0af2dd855f35b5e359dc730c58a953d641d (diff) | |
Maintenance: Start of 2.71 release cycle, BCon1, Alpha.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index d35ff80265f..415a912d666 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 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 29ba7b09e5c..a30a8815230 100644 --- 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); |