Merge branch 'dev' into release

Author: frenchdog

CHANGELOG.md

@@ -1,3 +1,38 @@
+## [1.2.0] - 2023-05-12
+
+### Build
+
+ - BIFROST-8086 - fix unit test errors
+
+### Feature
+
+ - BIFROST 8452 - Add color support to the _read_usd_curve_ and improve _define_usd_curves_ UI
+    - Add option in _read_usd_curves_ to import _displayColor_ attribute as _point_color_ geo property.
+    - Add Combo Box in _define_usd_curves_ to set basis and type parameters.
+
+ - BIFROST-8452 - Add option in _read_usd_meshes_ to import _displayColor_ attribute as _point_color_ geo property
+
+ - BIFROST-6771 - Add soft min-max sliders and color pickers widgets in following compounds
+    - _define_usd_display_color_
+    - _define_usd_point_instancer_
+    - _define_usd_preview_surface_
+    - _define_usd_transform_
+    - _duplicate_usd_prim_definition_
+
+ - BIFROST-8319 - Add _get_authored_attribute_names_ node, to get all authored attributes names 
+
+ - BIFROST-8100 - Add _get_all_attribute_names_ node, to get all prim attributes names
+
+### Bugfix
+
+ - BIFROST-8426 - Inconsistent UI in define_usd_prim
+
+ - BIFROST-8273 - fix sublayers not saved if relative_path is on
+   - Use the layer's save file path (m_filePath) instead of the sdfLayerIdentifier in the recursive call to Layer::exportToFile().
+   - Add new more complete unit test for export_layer_to_file() that covers multiple cases for relative and absolute paths to sublayers.
+   - removed call to changeDir() that has side effect and is not required anymore for unit tests.
+
+
 ## [1.1.0] - 2023-03-29
 
 ### Build
@@ -13,12 +48,15 @@
 ### Feature
 
 - BIFROST-7955 - Add applied schema nodes
-	- add_applied_schema: This node adds the applied API schema name to the apiSchema metadata of the prim
-	- remove_applied_schema: This node removes the applied API schema name from the apiSchema metadata of the prim
+   - add_applied_schema: This node adds the applied API schema name to the apiSchema metadata of the prim
+   - remove_applied_schema: This node removes the applied API schema name from the apiSchema metadata of the prim
 
 
 ### Bugfix
 
 ## [1.0.0] - 2022-12-12
 
-Initial release
+ - Initial release
+- 2022-12-12
+
+ - Initial release

cmake/version.info

@@ -1,5 +1,7 @@
 # This file has been auto-generated.
 
 set(BIFROST_USD_PACK_MAJOR_VERSION 1)
-set(BIFROST_USD_PACK_MINOR_VERSION 1)
+
+set(BIFROST_USD_PACK_MINOR_VERSION 2)
+
 set(BIFROST_USD_PACK_PATCH_LEVEL   0)

src/BifrostUsd/Layer.cpp

@@ -1,5 +1,5 @@
 //-
-// Copyright 2022 Autodesk, Inc.
+// Copyright 2023 Autodesk, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -384,27 +384,27 @@ bool Layer::exportToFile(const Amino::String& filePath,
     // Replace anonymous sublayer identifier by real layer file path
     for (int i = 0; i < static_cast<int>(m_subLayers.size()); ++i) {
         const auto& layer = m_subLayers[i];
-        Amino::String layerPath = layer.m_filePath.empty() ?
+        Amino::String sdfLayerIdentifier = layer.m_filePath.empty() ?
             layer.m_originalFilePath : layer.m_filePath;
         if (relativePath) {
             Amino::String relPath = "";
             if (Bifrost::FileUtils::getRelativePath(
-                    layerPath,
+                    sdfLayerIdentifier,
                     Bifrost::FileUtils::extractParentPath(outFilePath.c_str())
                         .c_str(),
                     relPath)) {
-                layerPath = relPath;
-                std::replace(layerPath.begin(), layerPath.end(), '\\', '/');
+                sdfLayerIdentifier = relPath;
+                std::replace(sdfLayerIdentifier.begin(), sdfLayerIdentifier.end(), '\\', '/');
             }
         }
-        if (layerPath.empty()) {
+        if (sdfLayerIdentifier.empty()) {
             return false;
         }
 
-        layer.exportToFile(layerPath, relativePath);
+        layer.exportToFile(layer.m_filePath, relativePath);
 
         outLayer->RemoveSubLayerPath(i);
-        outLayer->InsertSubLayerPath(layerPath.c_str(), i);
+        outLayer->InsertSubLayerPath(sdfLayerIdentifier.c_str(), i);
     }
 
     return outLayer->Save();