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:
authorBrecht Van Lommel <brecht>2020-05-25 11:49:04 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-05-29 18:48:26 +0300
commita86b5df005d0c474de973215b112f404902b2607 (patch)
treeed5d1e453beb37e8fe416242008e3283bf8dc2e9 /source/blender/windowmanager
parent1d2b89304ac33993c29f53ebdd41cc84056982d1 (diff)
Blender: change bugfix release versioning from a/b/c to .1/.2/.3
The file subversion is no longer used in the Python API or user interface, and is now internal to Blender. User interface, Python API and file I/O metadata now use more consistent formatting for version numbers. Official releases use "2.83.0", "2.83.1", and releases under development use "2.90.0 Alpha", "2.90.0 Beta". Some Python add-ons may need to lower the Blender version in bl_info to (2, 83, 0) or (2, 90, 0) if they used a subversion number higher than 0. https://wiki.blender.org/wiki/Reference/Release_Notes/2.83/Python_API#Compatibility This change is in preparation of LTS releases, and also brings us more in line with semantic versioning. Fixes T76058. Differential Revision: https://developer.blender.org/D7748
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_splash_screen.c35
1 files changed, 2 insertions, 33 deletions
diff --git a/source/blender/windowmanager/intern/wm_splash_screen.c b/source/blender/windowmanager/intern/wm_splash_screen.c
index 17dc3e22984..1fcde9685b9 100644
--- a/source/blender/windowmanager/intern/wm_splash_screen.c
+++ b/source/blender/windowmanager/intern/wm_splash_screen.c
@@ -99,42 +99,13 @@ static void wm_block_splash_add_label(uiBlock *block, const char *label, int x,
static void wm_block_splash_add_labels(uiBlock *block, int x, int y)
{
/* Version number. */
- const char *version_cycle = NULL;
- bool show_build_info = true;
-
- if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "alpha")) {
- version_cycle = " Alpha";
- }
- else if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "beta")) {
- version_cycle = " Beta";
- }
- else if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "rc")) {
- version_cycle = " Release Candidate";
- show_build_info = false;
- }
- else if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "release")) {
- version_cycle = STRINGIFY(BLENDER_VERSION_CHAR);
- show_build_info = false;
- }
-
- const char *version_cycle_number = "";
- if (strlen(STRINGIFY(BLENDER_VERSION_CYCLE_NUMBER))) {
- version_cycle_number = " " STRINGIFY(BLENDER_VERSION_CYCLE_NUMBER);
- }
-
char version_buf[256] = "\0";
- BLI_snprintf(version_buf,
- sizeof(version_buf),
- "v %d.%d%s%s",
- BLENDER_VERSION / 100,
- BLENDER_VERSION % 100,
- version_cycle,
- version_cycle_number);
+ BLI_snprintf(version_buf, sizeof(version_buf), "v%s", BKE_blender_version_string());
wm_block_splash_add_label(block, version_buf, x, &y);
#ifdef WITH_BUILDINFO
- if (show_build_info) {
+ if (!STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "release")) {
extern unsigned long build_commit_timestamp;
extern char build_hash[], build_commit_date[], build_commit_time[], build_branch[];
@@ -159,8 +130,6 @@ static void wm_block_splash_add_labels(uiBlock *block, int x, int y)
wm_block_splash_add_label(block, branch_buf, x, &y);
}
}
-#else
- UNUSED_VARS(show_build_info);
#endif /* WITH_BUILDINFO */
}