Don't crash if images fail to load.

CesiumGS · Nov 28, 2024 · 7727407 · 7727407
1 parent 6d5497d
commit 7727407
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Source/CesiumRuntime/Private/CesiumGltfTextures.cpp b/Source/CesiumRuntime/Private/CesiumGltfTextures.cpp
@@ -238,7 +238,7 @@ SharedFuture<void> createTextureInLoadThread(
 
   CesiumGltf::Image* pImage =
       CesiumGltf::Model::getSafe(&gltf.images, pTexture->source);
-  if (pImage == nullptr)
+  if (pImage == nullptr || pImage->pAsset == nullptr)
     return asyncSystem.createResolvedFuture().share();
 
   check(pTexture->source >= 0 && pTexture->source < imageNeedsMipmaps.size());

diff --git a/Source/CesiumRuntime/Private/CesiumTextureUtility.cpp b/Source/CesiumRuntime/Private/CesiumTextureUtility.cpp
@@ -179,6 +179,10 @@ TUniquePtr<LoadedTextureResult> loadTextureFromModelAnyThreadPart(
   };
 
   CesiumGltf::Image& image = model.images[*optionalSourceIndex];
+  if (image.pAsset == nullptr) {
+    return nullptr;
+  }
+
   const CesiumGltf::Sampler& sampler =
       model.getSafe(model.samplers, texture.sampler);