Merge remote-tracking branch 'origin/main' into ue55

CesiumGS · Nov 21, 2024 · fc9b5fb · fc9b5fb
2 parents d30fd44 + 6babafe
commit fc9b5fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTable.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTable.spec.cpp
@@ -24,7 +24,7 @@ void FCesiumPropertyTableSpec::Define() {
     model = CesiumGltf::Model();
     pExtension =
         &model.addExtension<CesiumGltf::ExtensionModelExtStructuralMetadata>();
-    pExtension->schema = CesiumGltf::Schema();
+    pExtension->schema.emplace();
     pPropertyTable = &pExtension->propertyTables.emplace_back();
   });
 
@@ -44,7 +44,7 @@ void FCesiumPropertyTableSpec::Define() {
     });
 
     It("constructs invalid instance for missing schema", [this]() {
-      pExtension->schema = std::nullopt;
+      pExtension->schema.reset();
 
       FCesiumPropertyTable propertyTable(model, *pPropertyTable);
       TestEqual(

diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp
@@ -36,7 +36,7 @@ void FCesiumPropertyTextureSpec::Define() {
   BeforeEach([this]() {
     model = Model();
     pExtension = &model.addExtension<ExtensionModelExtStructuralMetadata>();
-    pExtension->schema = Schema();
+    pExtension->schema.emplace();
     pPropertyTexture = &pExtension->propertyTextures.emplace_back();
   });
 
@@ -55,7 +55,7 @@ void FCesiumPropertyTextureSpec::Define() {
     });
 
     It("constructs invalid instance for missing schema", [this]() {
-      pExtension->schema = std::nullopt;
+      pExtension->schema.reset();
 
       FCesiumPropertyTexture propertyTexture(model, *pPropertyTexture);
       TestEqual(

diff --git a/extern/cesium-native b/extern/cesium-native