blender
/
blender
134
399
Fork 581
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Bump version to Blender2.70rc and new splash 

Splash concept art & paint-over: David Revoy. 3D artwork by Mathieu Auvray.
This commit is contained in:
Campbell Barton 2014-03-06 04:37:14 +11:00
parent deb6f733a6
commit f56a74566a
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/manpage/blender.1
View File

@ -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

BIN
release/datafiles/splash.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 216 KiB

After

Width:  |  Height:  |  Size: 202 KiB

BIN
release/datafiles/splash_2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 685 KiB

After

Width:  |  Height:  |  Size: 645 KiB

6
source/blender/blenkernel/BKE_blender.h
View File

@ -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 */

7
source/blender/windowmanager/intern/wm_operators.c
View File

@ -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);