From a86b5df005d0c474de973215b112f404902b2607 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht>
Date: Mon, 25 May 2020 10:49:04 +0200
Subject: 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
---
 source/blender/io/alembic/intern/abc_writer_archive.cc |  2 +-
 source/blender/io/collada/DocumentExporter.cpp         | 13 +++----------
 source/blender/io/usd/intern/usd_capi.cc               |  3 ++-
 3 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'source/blender/io')

diff --git a/source/blender/io/alembic/intern/abc_writer_archive.cc b/source/blender/io/alembic/intern/abc_writer_archive.cc
index af18d480a18..8199c0bdaf7 100644
--- a/source/blender/io/alembic/intern/abc_writer_archive.cc
+++ b/source/blender/io/alembic/intern/abc_writer_archive.cc
@@ -53,7 +53,7 @@ static OArchive create_archive(std::ostream *ostream,
 
   abc_metadata.set(Alembic::Abc::kApplicationNameKey, "Blender");
   abc_metadata.set(Alembic::Abc::kUserDescriptionKey, scene_name);
-  abc_metadata.set("blender_version", versionstr);
+  abc_metadata.set("blender_version", std::string("v") + BKE_blender_version_string());
   abc_metadata.set("FramesPerTimeUnit", std::to_string(scene_fps));
 
   time_t raw_time;
diff --git a/source/blender/io/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp
index 7565aa881fd..a7f9c28fc11 100644
--- a/source/blender/io/collada/DocumentExporter.cpp
+++ b/source/blender/io/collada/DocumentExporter.cpp
@@ -245,20 +245,13 @@ int DocumentExporter::exportCurrentScene()
 #ifdef WITH_BUILDINFO
   BLI_snprintf(version_buf,
                sizeof(version_buf),
-               "Blender %d.%02d.%d commit date:%s, commit time:%s, hash:%s",
-               BLENDER_VERSION / 100,
-               BLENDER_VERSION % 100,
-               BLENDER_SUBVERSION,
+               "Blender %s commit date:%s, commit time:%s, hash:%s",
+               BKE_blender_version_string(),
                build_commit_date,
                build_commit_time,
                build_hash);
 #else
-  BLI_snprintf(version_buf,
-               sizeof(version_buf),
-               "Blender %d.%02d.%d",
-               BLENDER_VERSION / 100,
-               BLENDER_VERSION % 100,
-               BLENDER_SUBVERSION);
+  BLI_snprintf(version_buf, sizeof(version_buf), "Blender %s", BKE_blender_version_string());
 #endif
   asset.getContributor().mAuthoringTool = version_buf;
   asset.add();
diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc
index 60ab3676847..1b3bbc29ed6 100644
--- a/source/blender/io/usd/intern/usd_capi.cc
+++ b/source/blender/io/usd/intern/usd_capi.cc
@@ -93,7 +93,8 @@ static void export_startjob(void *customdata, short *stop, short *do_update, flo
   usd_stage->SetMetadata(pxr::UsdGeomTokens->upAxis, pxr::VtValue(pxr::UsdGeomTokens->z));
   usd_stage->SetMetadata(pxr::UsdGeomTokens->metersPerUnit,
                          pxr::VtValue(scene->unit.scale_length));
-  usd_stage->GetRootLayer()->SetDocumentation(std::string("Blender ") + versionstr);
+  usd_stage->GetRootLayer()->SetDocumentation(std::string("Blender v") +
+                                              BKE_blender_version_string());
 
   // Set up the stage for animated data.
   if (data->params.export_animation) {
-- 
cgit v1.2.3