From f56a74566a0a80cd35521e7dafb60dc3d912ae84 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 6 Mar 2014 04:37:14 +1100 Subject: Bump version to Blender2.70rc and new splash Splash concept art & paint-over: David Revoy. 3D artwork by Mathieu Auvray. --- source/blender/blenkernel/BKE_blender.h | 6 +++--- source/blender/windowmanager/intern/wm_operators.c | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 2e9e6f2db3a..d35ff80265f 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -41,8 +41,8 @@ extern "C" { /* these lines are grep'd, watch out for our not-so-awesome regex * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ -#define BLENDER_VERSION 269 -#define BLENDER_SUBVERSION 11 +#define BLENDER_VERSION 270 +#define BLENDER_SUBVERSION 0 /* 262 was the last editmesh release but it has compatibility code for bmesh data */ #define BLENDER_MINVERSION 262 #define BLENDER_MINSUBVERSION 0 @@ -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 alpha +#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 e5f9aae249d..b063a8883a0 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1819,11 +1819,12 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar if (1) { /* placed after the version number in the image, * placing y is tricky to match baseline */ - int x = 254 - (2 * UI_DPI_WINDOW_FAC); - int y = 244 + (4 * UI_DPI_WINDOW_FAC); + int x = 260 - (2 * UI_DPI_WINDOW_FAC); + int y = 242 + (4 * UI_DPI_WINDOW_FAC); int w = 240; - const char *version_suffix = "Testing"; + const char *version_suffix = "Release Candidate"; + /* hack to have text draw 'text_sel' */ uiBlockSetEmboss(block, UI_EMBOSSN); -- cgit v1.2.3