diff --git a/doc/manpage/blender.1 b/doc/manpage/blender.1 index 9cefe7a2b24f6b1e75668eb284ce44a2ee24da60..b7d96dcbb3bf4b99d7f57745f6441501461ff295 100644 --- a/doc/manpage/blender.1 +++ b/doc/manpage/blender.1 @@ -1,4 +1,4 @@ -.TH "BLENDER" "1" "February 14, 2013" "Blender Blender 2\&.66" +.TH "BLENDER" "1" "March 6, 2014" "Blender Blender 2\&.70" .SH NAME blender \- a 3D modelling and rendering package diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png index ad0028ee0b45f7f4aa617963e26ae21268f48c52..b496bb77245002da252bac7948de939e6ee8fd33 100644 Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png differ diff --git a/release/datafiles/splash_2x.png b/release/datafiles/splash_2x.png index 707cfee52ecb843055bb47a92e3054b8ed26f7bb..654d07b093fc23636d1c192b47e2c379628d8864 100644 Binary files a/release/datafiles/splash_2x.png and b/release/datafiles/splash_2x.png differ diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 2e9e6f2db3a367e4ae79c5f18e93de08fa7c6877..d35ff80265fea19469dcb5eadaecd40971d9236c 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 e5f9aae249dfda5539ad8c946b0619e15ec66345..b063a8883a0e0552e9a6137e2847a59d6ecb7b0e 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);