Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-02-19 12:49:46 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-02-19 12:49:46 +0300
commita4dbff33c90e8e6e3bc33529a9e475333a72f501 (patch)
tree7db5b2da70436d50f734a998e923c19f0abde621
parent59cc0bfef55ce04d945b3fb44db5a8f4d51f117e (diff)
Blender 2.79a: Prepare for release
Enter release state and make spacing to "a" more sane. There is still at least one fix we want to get in, before declaring we are ready for release.
-rw-r--r--source/blender/blenkernel/BKE_blender_version.h2
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 288dc636a93..91fa441e662 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -37,7 +37,7 @@
/* can be left blank, otherwise a,b,c... etc with no quotes */
#define BLENDER_VERSION_CHAR a
/* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
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 bed6a73c346..877f142a185 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1818,7 +1818,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
if (version_suffix != NULL && version_suffix[0]) {
/* placed after the version number in the image,
* placing y is tricky to match baseline */
- int x = 260 * U.pixelsize - (2 * UI_DPI_FAC);
+ int x = 252 * U.pixelsize - (2 * UI_DPI_FAC);
int y = 242 * U.pixelsize + (4 * UI_DPI_FAC);
int w = 240 * U.pixelsize;