Skip to content

Commit 8a0d95e

Browse files
authored
Merge pull request #1282 from CesiumGS/unshared-assets
Fix shared asset problems
2 parents 8ed4f90 + 5f86a1d commit 8a0d95e

3 files changed

Lines changed: 4 additions & 1 deletion

File tree

Cesium3DTilesSelection/src/CesiumIonTilesetLoader.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ CesiumIonTilesetLoader::loadTileContent(const TileLoadInput& loadInput) {
373373
this->_pLogger,
374374
loadInput.requestHeaders,
375375
loadInput.ellipsoid);
376+
aggregatedInput.pSharedAssetSystem = loadInput.pSharedAssetSystem;
376377

377378
return this->_pAggregatedLoader->loadTileContent(aggregatedInput);
378379
}

Cesium3DTilesSelection/src/ITwinRealityDataContentLoader.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ ITwinRealityDataContentLoader::loadTileContent(const TileLoadInput& loadInput) {
416416
this->_pLogger,
417417
loadInput.requestHeaders,
418418
loadInput.ellipsoid);
419+
aggregatedInput.pSharedAssetSystem = loadInput.pSharedAssetSystem;
419420

420421
return this->_pAggregatedLoader->loadTileContent(aggregatedInput);
421422
}

CesiumGltfReader/src/GltfReader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <CesiumGltf/ExtensionModelExtStructuralMetadata.h>
2121
#include <CesiumGltf/ExtensionTextureWebp.h>
2222
#include <CesiumGltf/Image.h>
23+
#include <CesiumGltf/ImageAsset.h>
2324
#include <CesiumGltf/Ktx2TranscodeTargets.h>
2425
#include <CesiumGltf/Schema.h>
2526
#include <CesiumGltf/Texture.h>
@@ -283,7 +284,7 @@ void postprocess(GltfReaderResult& readGltf, const GltfReaderOptions& options) {
283284
}
284285

285286
// Image has already been decoded
286-
if (image.pAsset && !image.pAsset->pixelData.empty()) {
287+
if (image.pAsset) {
287288
continue;
288289
}
289290

0 commit comments

Comments
 (0)