Update to kit-kernel@106

CesiumGS · Jun 25, 2024 · 5d0f0eb · 5d0f0eb
1 parent 37f7185
commit 5d0f0eb
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 88 deletions.
diff --git a/apps/cesium.omniverse.dev.kit b/apps/cesium.omniverse.dev.kit
@@ -5,7 +5,7 @@ app = true
 
 [dependencies]
 # Include basic configuration (that brings most of basic extensions)
-"omni.app.dev" = {}
+"omni.app.editor.base" = {}
 "omni.kit.window.material_graph" = {optional = true}
 "cesium.omniverse" = {}
 "cesium.powertools" = {}

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -92,9 +92,10 @@ endif()
 set(NVIDIA_BUILD_DIR "${PROJECT_SOURCE_DIR}/extern/nvidia/_build")
 set(NVIDIA_USD_ROOT "${NVIDIA_BUILD_DIR}/target-deps/usd")
 set(PYTHON_ROOT "${NVIDIA_BUILD_DIR}/target-deps/python")
-set(USDRT_ROOT "${NVIDIA_BUILD_DIR}/target-deps/usdrt")
 set(CARB_ROOT "${NVIDIA_BUILD_DIR}/target-deps/carb_sdk_plugins")
 set(KIT_SDK_ROOT "${NVIDIA_BUILD_DIR}/target-deps/kit-sdk")
+set(KIT_OMNI_UI_ROOT "${NVIDIA_BUILD_DIR}/target-deps/omni-ui")
+set(KIT_IMGUI_ROOT "${NVIDIA_BUILD_DIR}/target-deps/omni-kit-renderer-imgui")
 set(PYBIND11_ROOT "${NVIDIA_BUILD_DIR}/target-deps/pybind11")
 set(CUDA_ROOT "${NVIDIA_BUILD_DIR}/target-deps/cuda")
 
@@ -215,20 +216,10 @@ else()
 endif()
 
 # cmake-format: off
-add_prebuilt_project(
-    RELEASE_INCLUDE_DIR
-        "${USDRT_ROOT}/include/usdrt_only"
-    DEBUG_INCLUDE_DIR
-        "${USDRT_ROOT}/include/usdrt_only"
-    RELEASE_LIBRARY_DIR
-        "${USDRT_ROOT}/_build/${NVIDIA_PLATFORM_NAME}/${NVIDIA_RELEASE_FOLDER_NAME}/usdrt_only"
-    DEBUG_LIBRARY_DIR
-        "${USDRT_ROOT}/_build/${NVIDIA_PLATFORM_NAME}/${NVIDIA_DEBUG_FOLDER_NAME}/usdrt_only"
-    RELEASE_LIBRARIES
-        omni.fabric.plugin
-    DEBUG_LIBRARIES
-        omni.fabric.plugin
-    TARGET_NAMES
+add_prebuilt_project_header_only(
+    INCLUDE_DIR
+        "${KIT_SDK_ROOT}/dev/fabric/include"
+    TARGET_NAME
         fabric
 )
 # cmake-format: on
@@ -373,9 +364,9 @@ add_prebuilt_project(
     DEBUG_INCLUDE_DIR
         "${KIT_SDK_ROOT}/dev/include"
     RELEASE_LIBRARY_DIR
-        "${KIT_SDK_ROOT}/exts/omni.ui/bin"
+        "${KIT_OMNI_UI_ROOT}/bin"
     DEBUG_LIBRARY_DIR
-        "${KIT_SDK_ROOT}/exts/omni.ui/bin"
+        "${KIT_OMNI_UI_ROOT}/bin"
     RELEASE_LIBRARIES
         omni.ui
     DEBUG_LIBRARIES
@@ -387,8 +378,8 @@ add_prebuilt_project(
 
 if(WIN32)
     set(NVIDIA_ADDITIONAL_LIBRARIES
-        "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/kit-sdk/exts/omni.kit.renderer.imgui/bin/imgui.dll"
-        "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/kit-sdk/exts/omni.kit.renderer.imgui/bin/deps/freetype.dll"
+        "${KIT_IMGUI_ROOT}/bin/imgui.dll"
+        "${KIT_IMGUI_ROOT}/bin/deps/freetype.dll"
     )
 
     set_property(GLOBAL PROPERTY NVIDIA_ADDITIONAL_LIBRARIES_PROPERTY "${NVIDIA_ADDITIONAL_LIBRARIES}")
@@ -398,11 +389,11 @@ else()
         "$<TARGET_FILE_DIR:usd>"
         "$<TARGET_FILE_DIR:carb>"
         # This is where freetype is located on Linux
-        "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/kit-sdk/exts/omni.kit.renderer.imgui/bin/deps")
+        "${KIT_IMGUI_ROOT}/bin/deps")
 
     set(NVIDIA_ADDITIONAL_LINK_DIRECTORIES
         # This is where freetype is located on Linux. Needed by imgui which doesn't set its rpath properly
-        "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/kit-sdk/exts/omni.kit.renderer.imgui/bin/deps")
+        "${KIT_IMGUI_ROOT}/bin/deps")
 
     set_property(GLOBAL PROPERTY NVIDIA_ADDITIONAL_SEARCH_PATHS_PROPERTY "${NVIDIA_ADDITIONAL_SEARCH_PATHS}")
     set_property(GLOBAL PROPERTY NVIDIA_ADDITIONAL_LINK_DIRECTORIES_PROPERTY "${NVIDIA_ADDITIONAL_LINK_DIRECTORIES}")

diff --git a/extern/nvidia/debug-deps/kit-sdk.packman.user.xml b/extern/nvidia/debug-deps/kit-sdk.packman.user.xml
@@ -1,5 +1,25 @@
 <project toolsVersion="5.6">
-  <dependency name="kit_sdk_debug" linkPath="../_build/target-deps/kit-sdk-debug/">
-    <package name="kit-sdk" version="105.1.2+release.135279.09b309e7.tc.${platform}.debug"/>
+  <dependency name="kit-kernel-debug" linkPath="../_build/target-deps/kit-sdk-debug/">
+    <package name="kit-kernel" version="106.0.0+release.118399.fcefe91f.gl.${platform}.debug"/>
+  </dependency>
+  <!-- build-time dependencies -->
+  <!-- the versions MUST correspond to the versions pulled in by kit-kernel during extension precaching-->
+  <!-- you can find the versions by running the dev kit app  ./extern/nvidia/_build/target-deps/kit-sdk/kit apps/cesium.omniverse.dev.kit  -->
+  <!-- which will download the extensions on the first run and log the versions to stdout -->
+  <!--
+  [23.471s] Pulling extension: `omni.ui-2.23.11` from the registry.
+  [omni.kit.registry.nucleus] [tid: 128747226389376] downloading: 'http://d4i3qtqj3r0z5.cloudfront.net/omni.ui-7c6502313c182ec0.zip' -> '/tmp/tmpn5jlkygu/omni.ui-2.23.11+fcefe91f.lx64.r.cp310.zip'...
+
+  [23.286s] Pulling extension: `omni.kit.renderer.imgui-1.0.1` from the registry.
+  [omni.kit.registry.nucleus] [tid: 128747226389376] downloading: 'http://d4i3qtqj3r0z5.cloudfront.net/omni.kit.renderer.imgui-6d3c178f53bf4534.zip' -> '/tmp/tmpp3l_d2ae/omni.kit.renderer.imgui-1.0.1+fcefe91f.lx64.r.cp310.zip'...
+  [23.471s] Extension: `omni.kit.renderer.imgui-1.0.1` was installed.
+  -->
+  <dependency name="omni-ui" linkPath="../_build/target-deps/omni-ui/">
+    <package name="omni.ui" version="7c6502313c182ec0" platforms="linux-x86_64"/>
+    <package name="omni.ui" version="d84e7b34ee8e4433" platforms="windows-x86_64"/>
+  </dependency>
+  <dependency name="omni-kit-renderer-imgui" linkPath="../_build/target-deps/omni-kit-renderer-imgui/">
+    <package name="omni.kit.renderer.imgui" version="6d3c178f53bf4534" platforms="linux-x86_64" />
+    <package name="omni.kit.renderer.imgui" version="9c4244a14d3bef05" platforms="windows-x86_64" />
   </dependency>
 </project>
diff --git a/extern/nvidia/deps/kit-sdk.packman.xml b/extern/nvidia/deps/kit-sdk.packman.xml
@@ -1,5 +1,25 @@
 <project toolsVersion="5.6">
-  <dependency name="kit_sdk" linkPath="../_build/target-deps/kit-sdk/">
-    <package name="kit-sdk" version="105.1.2+release.135279.09b309e7.tc.${platform}.release"/>
+  <dependency name="kit-kernel" linkPath="../_build/target-deps/kit-sdk/">
+    <package name="kit-kernel" version="106.0.0+release.118399.fcefe91f.gl.${platform}.release"/>
+  </dependency>
+  <!-- build-time dependencies -->
+  <!-- the versions MUST correspond to the versions pulled in by kit-kernel during extension precaching-->
+  <!-- you can find the versions by running the dev kit app  ./extern/nvidia/_build/target-deps/kit-sdk/kit apps/cesium.omniverse.dev.kit  -->
+  <!-- which will download the extensions on the first run and log the versions to stdout -->
+  <!--
+  [23.471s] Pulling extension: `omni.ui-2.23.11` from the registry.
+  [omni.kit.registry.nucleus] [tid: 128747226389376] downloading: 'http://d4i3qtqj3r0z5.cloudfront.net/omni.ui-7c6502313c182ec0.zip' -> '/tmp/tmpn5jlkygu/omni.ui-2.23.11+fcefe91f.lx64.r.cp310.zip'...
+
+  [23.286s] Pulling extension: `omni.kit.renderer.imgui-1.0.1` from the registry.
+  [omni.kit.registry.nucleus] [tid: 128747226389376] downloading: 'http://d4i3qtqj3r0z5.cloudfront.net/omni.kit.renderer.imgui-6d3c178f53bf4534.zip' -> '/tmp/tmpp3l_d2ae/omni.kit.renderer.imgui-1.0.1+fcefe91f.lx64.r.cp310.zip'...
+  [23.471s] Extension: `omni.kit.renderer.imgui-1.0.1` was installed.
+  -->
+  <dependency name="omni-ui" linkPath="../_build/target-deps/omni-ui/">
+    <package name="omni.ui" version="7c6502313c182ec0" platforms="linux-x86_64"/>
+    <package name="omni.ui" version="d84e7b34ee8e4433" platforms="windows-x86_64"/>
+  </dependency>
+  <dependency name="omni-kit-renderer-imgui" linkPath="../_build/target-deps/omni-kit-renderer-imgui/">
+    <package name="omni.kit.renderer.imgui" version="6d3c178f53bf4534" platforms="linux-x86_64" />
+    <package name="omni.kit.renderer.imgui" version="9c4244a14d3bef05" platforms="windows-x86_64" />
   </dependency>
 </project>
diff --git a/extern/nvidia/deps/target-deps.packman.xml b/extern/nvidia/deps/target-deps.packman.xml
@@ -3,15 +3,13 @@
   <import path="../_build/target-deps/kit-sdk/dev/all-deps.packman.xml">
     <filter include="python"/>
     <filter include="nv_usd_py310_release"/>
-    <filter include="usdrt"/>
     <filter include="carb_sdk_plugins"/>
     <filter include="pybind11"/>
     <filter include="cuda"/>
   </import>
   <!-- Override the link paths to point to the correct locations. -->
   <dependency name="python" linkPath="../_build/target-deps/python"/>
   <dependency name="nv_usd_py310_release" linkPath="../_build/target-deps/usd/release"/>
-  <dependency name="usdrt" linkPath="../_build/target-deps/usdrt"/>
   <dependency name="carb_sdk_plugins" linkPath="../_build/target-deps/carb_sdk_plugins"/>
   <dependency name="pybind11" linkPath="../_build/target-deps/pybind11/pybind11"/>
   <dependency name="cuda" linkPath="../_build/target-deps/cuda/cuda"/>

diff --git a/extern/nvidia/tools/packman/config.packman.xml b/extern/nvidia/tools/packman/config.packman.xml
@@ -1,5 +1,8 @@
-<config remotes="cloudfront">
+<config remotes="cloudfront cloudfront-extensions">
     <remote2 name="cloudfront">
         <transport actions="download" protocol="https" packageLocation="d4i3qtqj3r0z5.cloudfront.net/${name}@${version}" />
     </remote2>
+    <remote2 name="cloudfront-extensions">
+        <transport actions="download" protocol="https" packageLocation="d4i3qtqj3r0z5.cloudfront.net/${name}-${version}" />
+    </remote2>
 </config>
diff --git a/src/core/include/cesium/omniverse/UsdTokens.h b/src/core/include/cesium/omniverse/UsdTokens.h
@@ -82,16 +82,12 @@ __pragma(warning(push)) __pragma(warning(disable : 4003))
     (subdivisionScheme) \
     (vertex) \
     (vertexId) \
-    (_cesium_gltfLocalToEcefTransform) \
     (_cesium_tilesetId) \
     (_deletedPrims) \
     (_materialSource) \
     (_paramColorSpace) \
     (_sdrMetadata) \
     (_worldExtent) \
-    (_worldOrientation) \
-    (_worldPosition) \
-    (_worldScale) \
     (_worldVisibility) \
     ((info_implementationSource, "info:implementationSource")) \
     ((info_mdl_sourceAsset, "info:mdl:sourceAsset")) \
@@ -152,6 +148,8 @@ __pragma(warning(push)) __pragma(warning(disable : 4003))
     ((xformOp_rotateZYX, "xformOp:rotateZYX")) \
     ((xformOp_scale, "xformOp:scale")) \
     ((xformOp_translate, "xformOp:translate")) \
+    ((_localMatrix, "omni:fabric:localMatrix")) \
+    ((_worldMatrix, "omni:fabric:worldMatrix")) \
     ((_auto, "auto"))
 
 #ifdef CESIUM_OMNI_CLANG
@@ -274,15 +272,14 @@ const omni::fabric::Type primvars_st(omni::fabric::BaseDataType::eFloat, 2, 1, o
 const omni::fabric::Type primvars_vertexId(omni::fabric::BaseDataType::eFloat, 1, 1, omni::fabric::AttributeRole::eNone);
 const omni::fabric::Type Shader(omni::fabric::BaseDataType::eTag, 1, 0, omni::fabric::AttributeRole::ePrimTypeName);
 const omni::fabric::Type subdivisionScheme(omni::fabric::BaseDataType::eToken, 1, 0, omni::fabric::AttributeRole::eNone);
-const omni::fabric::Type _cesium_gltfLocalToEcefTransform(omni::fabric::BaseDataType::eDouble, 16, 0, omni::fabric::AttributeRole::eMatrix);
 const omni::fabric::Type _cesium_tilesetId(omni::fabric::BaseDataType::eInt64, 1, 0, omni::fabric::AttributeRole::eNone);
 const omni::fabric::Type _materialSource(omni::fabric::BaseDataType::eRelationship, 1, 0, omni::fabric::AttributeRole::eNone);
 const omni::fabric::Type _paramColorSpace(omni::fabric::BaseDataType::eToken, 1, 1, omni::fabric::AttributeRole::eNone);
 const omni::fabric::Type _sdrMetadata(omni::fabric::BaseDataType::eToken, 1, 1, omni::fabric::AttributeRole::eNone);
 const omni::fabric::Type _worldExtent(omni::fabric::BaseDataType::eDouble, 6, 0, omni::fabric::AttributeRole::eNone);
-const omni::fabric::Type _worldOrientation(omni::fabric::BaseDataType::eFloat, 4, 0, omni::fabric::AttributeRole::eQuaternion);
-const omni::fabric::Type _worldPosition(omni::fabric::BaseDataType::eDouble, 3, 0, omni::fabric::AttributeRole::eNone);
-const omni::fabric::Type _worldScale(omni::fabric::BaseDataType::eFloat, 3, 0, omni::fabric::AttributeRole::eVector);
 const omni::fabric::Type _worldVisibility(omni::fabric::BaseDataType::eBool, 1, 0, omni::fabric::AttributeRole::eNone);
+const omni::fabric::Type _localMatrix(omni::fabric::BaseDataType::eDouble, 16, 0, omni::fabric::AttributeRole::eMatrix);
+const omni::fabric::Type _worldMatrix(omni::fabric::BaseDataType::eDouble, 16, 0, omni::fabric::AttributeRole::eMatrix);
+
 }
 // clang-format on
diff --git a/src/core/src/FabricGeometry.cpp b/src/core/src/FabricGeometry.cpp
@@ -121,8 +121,7 @@ void FabricGeometry::setMaterial(const omni::fabric::Path& materialPath) {
 
     auto& fabricStage = _pContext->getFabricStage();
     fabricStage.setArrayAttributeSize(_path, FabricTokens::material_binding, 1);
-    const auto materialBindingFabric =
-        fabricStage.getArrayAttributeWr<omni::fabric::PathC>(_path, FabricTokens::material_binding);
+    auto materialBindingFabric = fabricStage.getArrayAttributeWr<omni::fabric::Path>(_path, FabricTokens::material_binding);
     materialBindingFabric[0] = materialPath;
 }
 
@@ -150,10 +149,8 @@ void FabricGeometry::initialize() {
     attributes.addAttribute(FabricTypes::primvarInterpolations, FabricTokens::primvarInterpolations);
     attributes.addAttribute(FabricTypes::Mesh, FabricTokens::Mesh);
     attributes.addAttribute(FabricTypes::_cesium_tilesetId, FabricTokens::_cesium_tilesetId);
-    attributes.addAttribute(FabricTypes::_cesium_gltfLocalToEcefTransform, FabricTokens::_cesium_gltfLocalToEcefTransform);
-    attributes.addAttribute(FabricTypes::_worldPosition, FabricTokens::_worldPosition);
-    attributes.addAttribute(FabricTypes::_worldOrientation, FabricTokens::_worldOrientation);
-    attributes.addAttribute(FabricTypes::_worldScale, FabricTokens::_worldScale);
+    attributes.addAttribute(FabricTypes::_localMatrix, FabricTokens::_localMatrix);
+    attributes.addAttribute(FabricTypes::_worldMatrix, FabricTokens::_worldMatrix);
     attributes.addAttribute(FabricTypes::doubleSided, FabricTokens::doubleSided);
     attributes.addAttribute(FabricTypes::subdivisionScheme, FabricTokens::subdivisionScheme);
     attributes.addAttribute(FabricTypes::material_binding, FabricTokens::material_binding);
@@ -267,21 +264,18 @@ void FabricGeometry::reset() {
     const auto extentFabric = fabricStage.getAttributeWr<pxr::GfRange3d>(_path, FabricTokens::extent);
     const auto worldExtentFabric = fabricStage.getAttributeWr<pxr::GfRange3d>(_path, FabricTokens::_worldExtent);
     const auto worldVisibilityFabric = fabricStage.getAttributeWr<bool>(_path, FabricTokens::_worldVisibility);
-    const auto gltfLocalToEcefTransformFabric = fabricStage.getAttributeWr<pxr::GfMatrix4d>(_path, FabricTokens::_cesium_gltfLocalToEcefTransform);
-    const auto worldPositionFabric = fabricStage.getAttributeWr<pxr::GfVec3d>(_path, FabricTokens::_worldPosition);
-    const auto worldOrientationFabric = fabricStage.getAttributeWr<pxr::GfQuatf>(_path, FabricTokens::_worldOrientation);
-    const auto worldScaleFabric = fabricStage.getAttributeWr<pxr::GfVec3f>(_path, FabricTokens::_worldScale);
+    auto worldMatrixFabric = fabricStage.getAttributeWr<pxr::GfMatrix4d>(_path, FabricTokens::_worldMatrix);
+    auto localMatrixFabric = fabricStage.getAttributeWr<pxr::GfMatrix4d>(_path, FabricTokens::_localMatrix);
+
     const auto tilesetIdFabric = fabricStage.getAttributeWr<int64_t>(_path, FabricTokens::_cesium_tilesetId);
     // clang-format on
 
     *doubleSidedFabric = DEFAULT_DOUBLE_SIDED;
     *extentFabric = UsdUtil::glmToUsdExtent(DEFAULT_EXTENT);
     *worldExtentFabric = UsdUtil::glmToUsdExtent(DEFAULT_EXTENT);
     *worldVisibilityFabric = DEFAULT_VISIBILITY;
-    *gltfLocalToEcefTransformFabric = UsdUtil::glmToUsdMatrix(DEFAULT_MATRIX);
-    *worldPositionFabric = UsdUtil::glmToUsdVector(DEFAULT_POSITION);
-    *worldOrientationFabric = UsdUtil::glmToUsdQuat(glm::fquat(DEFAULT_ORIENTATION));
-    *worldScaleFabric = UsdUtil::glmToUsdVector(glm::fvec3(DEFAULT_SCALE));
+    *localMatrixFabric = UsdUtil::glmToUsdMatrix(DEFAULT_MATRIX);
+    *worldMatrixFabric = UsdUtil::glmToUsdMatrix(DEFAULT_MATRIX);
     *tilesetIdFabric = FabricUtil::NO_TILESET_ID;
 
     fabricStage.setArrayAttributeSize(_path, FabricTokens::material_binding, 0);
@@ -347,8 +341,7 @@ void FabricGeometry::setGeometry(
 
     const auto doubleSided = materialInfo.doubleSided;
     const auto gltfLocalToPrimWorldTransform = ecefToPrimWorldTransform * gltfLocalToEcefTransform;
-    const auto [primWorldPosition, primWorldOrientation, primWorldScale] =
-        MathUtil::decompose(gltfLocalToPrimWorldTransform);
+    const auto worldMatrix = UsdUtil::glmToUsdMatrix(gltfLocalToPrimWorldTransform);
     const auto primWorldExtent = MathUtil::transformExtent(gltfLocalExtent.value(), gltfLocalToPrimWorldTransform);
 
     if (primitive.mode == CesiumGltf::MeshPrimitive::Mode::POINTS) {
@@ -526,20 +519,18 @@ void FabricGeometry::setGeometry(
     const auto doubleSidedFabric = fabricStage.getAttributeWr<bool>(_path, FabricTokens::doubleSided);
     const auto extentFabric = fabricStage.getAttributeWr<pxr::GfRange3d>(_path, FabricTokens::extent);
     const auto worldExtentFabric = fabricStage.getAttributeWr<pxr::GfRange3d>(_path, FabricTokens::_worldExtent);
-    const auto gltfLocalToEcefTransformFabric = fabricStage.getAttributeWr<pxr::GfMatrix4d>(_path, FabricTokens::_cesium_gltfLocalToEcefTransform);
-    const auto worldPositionFabric = fabricStage.getAttributeWr<pxr::GfVec3d>(_path, FabricTokens::_worldPosition);
-    const auto worldOrientationFabric = fabricStage.getAttributeWr<pxr::GfQuatf>(_path, FabricTokens::_worldOrientation);
-    const auto worldScaleFabric = fabricStage.getAttributeWr<pxr::GfVec3f>(_path, FabricTokens::_worldScale);
+    auto worldMatrixFabric = fabricStage.getAttributeWr<pxr::GfMatrix4d>(_path, FabricTokens::_worldMatrix);
+    auto localMatrixFabric = fabricStage.getAttributeWr<pxr::GfMatrix4d>(_path, FabricTokens::_localMatrix);
     const auto tilesetIdFabric = fabricStage.getAttributeWr<int64_t>(_path, FabricTokens::_cesium_tilesetId);
     // clang-format on
 
     *doubleSidedFabric = doubleSided;
     *extentFabric = UsdUtil::glmToUsdExtent(gltfLocalExtent.value());
     *worldExtentFabric = UsdUtil::glmToUsdExtent(primWorldExtent);
-    *gltfLocalToEcefTransformFabric = UsdUtil::glmToUsdMatrix(gltfLocalToEcefTransform);
-    *worldPositionFabric = UsdUtil::glmToUsdVector(primWorldPosition);
-    *worldOrientationFabric = UsdUtil::glmToUsdQuat(glm::fquat(primWorldOrientation));
-    *worldScaleFabric = UsdUtil::glmToUsdVector(glm::fvec3(primWorldScale));
+    *localMatrixFabric = UsdUtil::glmToUsdMatrix(gltfLocalToEcefTransform);
+    *worldMatrixFabric = worldMatrix;
+
+
     *tilesetIdFabric = tilesetId;
 }
 

diff --git a/src/core/src/FabricMaterial.cpp b/src/core/src/FabricMaterial.cpp
@@ -530,20 +530,13 @@ FabricMaterial::FabricMaterial(
 }
 
 FabricMaterial::~FabricMaterial() {
-    // The code below is temporarily commented out to avoid a crash.
-    // It will cause a leak, but since this only happens when materials
-    // pools are destroyed (which doesn't happen during normal usage) it
-    // shouldn't be a huge concern.
-    //
-    // See https://github.com/CesiumGS/cesium-omniverse/issues/444 for details.
-
-    // if (stageDestroyed()) {
-    //     return;
-    // }
-
-    // for (const auto& path : _allPaths) {
-    //     FabricUtil::destroyPrim(_pContext->getFabricStage(), path);
-    // }
+    if (stageDestroyed()) {
+        return;
+    }
+
+    for (const auto& path : _allPaths) {
+        FabricUtil::destroyPrim(_pContext->getFabricStage(), path);
+    }
 }
 
 void FabricMaterial::setActive(bool active) {