Update development build to 1.39.0

This changelist updates the development build to 1.39.0, and addresses a few minor edits required to support minor versions more advanced than our test documents.
AcademySoftwareFoundation · Jul 13, 2023 · 426389c · 426389c
1 parent 3e838e2
commit 426389c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # MaterialX Version
 set(MATERIALX_MAJOR_VERSION 1)
-set(MATERIALX_MINOR_VERSION 38)
-set(MATERIALX_BUILD_VERSION 8)
+set(MATERIALX_MINOR_VERSION 39)
+set(MATERIALX_BUILD_VERSION 0)
 set(MATERIALX_LIBRARY_VERSION ${MATERIALX_MAJOR_VERSION}.${MATERIALX_MINOR_VERSION}.${MATERIALX_BUILD_VERSION})
 
 # Cmake setup

diff --git a/source/MaterialXCore/Document.cpp b/source/MaterialXCore/Document.cpp
@@ -896,7 +896,7 @@ void Document::upgradeVersion()
     }
 
     // Upgrade from 1.37 to 1.38
-    if (majorVersion == 1 && minorVersion >= 37)
+    if (majorVersion == 1 && minorVersion == 37)
     {
         // Convert color2 types to vector2
         const StringMap COLOR2_CHANNEL_MAP = { { "r", "x" }, { "a", "y" } };
@@ -1393,6 +1393,12 @@ void Document::upgradeVersion()
         minorVersion = 38;
     }
 
+    // Upgrade from 1.38 to 1.39
+    if (majorVersion == 1 && minorVersion == 38)
+    {
+        minorVersion = 39;
+    }
+
     std::pair<int, int> upgradedVersion(majorVersion, minorVersion);
     if (upgradedVersion == expectedVersion)
     {

diff --git a/source/MaterialXTest/MaterialXFormat/XmlIo.cpp b/source/MaterialXTest/MaterialXFormat/XmlIo.cpp
@@ -253,6 +253,7 @@ TEST_CASE("Comments and newlines", "[xmlio]")
     mx::XmlReadOptions readOptions;
     readOptions.readComments = true;
     readOptions.readNewlines = true;
+    readOptions.upgradeVersion = false;
     mx::readFromXmlString(doc, origXml, mx::FileSearchPath(), &readOptions);
 
     // Write the document to a new XML string buffer.