From 86b23a05e045403461a9baab002d9547152739eb Mon Sep 17 00:00:00 2001 From: Balaji M Date: Wed, 21 Aug 2024 13:33:46 -0400 Subject: [PATCH 1/2] decoding meshoptimized gltf just once --- libs/gltfio/src/extended/AssetLoaderExtended.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gltfio/src/extended/AssetLoaderExtended.cpp b/libs/gltfio/src/extended/AssetLoaderExtended.cpp index 19ee1eed77ab..4ac5868f2a5b 100644 --- a/libs/gltfio/src/extended/AssetLoaderExtended.cpp +++ b/libs/gltfio/src/extended/AssetLoaderExtended.cpp @@ -527,11 +527,11 @@ bool AssetLoaderExtended::createPrimitive(Input* input, Output* out, if (!mCgltfBuffersLoaded) { mCgltfBuffersLoaded = utility::loadCgltfBuffers(gltf, mGltfPath.c_str(), mUriDataCache); + utility::decodeMeshoptCompression(gltf); if (!mCgltfBuffersLoaded) return false; } utility::decodeDracoMeshes(gltf, prim, input->dracoCache); - utility::decodeMeshoptCompression(gltf); auto slots = computeGeometries(prim, jobType, attributesMap, morphTargets, out->uvmap, mEngine); From ec0e81b8d8b522afe821c9da748df5acc1989a42 Mon Sep 17 00:00:00 2001 From: Balaji M Date: Wed, 21 Aug 2024 14:32:54 -0400 Subject: [PATCH 2/2] return statement moved to separate line Co-authored-by: Powei Feng --- libs/gltfio/src/extended/AssetLoaderExtended.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/gltfio/src/extended/AssetLoaderExtended.cpp b/libs/gltfio/src/extended/AssetLoaderExtended.cpp index 4ac5868f2a5b..374347839112 100644 --- a/libs/gltfio/src/extended/AssetLoaderExtended.cpp +++ b/libs/gltfio/src/extended/AssetLoaderExtended.cpp @@ -527,8 +527,10 @@ bool AssetLoaderExtended::createPrimitive(Input* input, Output* out, if (!mCgltfBuffersLoaded) { mCgltfBuffersLoaded = utility::loadCgltfBuffers(gltf, mGltfPath.c_str(), mUriDataCache); + if (!mCgltfBuffersLoaded) { + return false; + } utility::decodeMeshoptCompression(gltf); - if (!mCgltfBuffersLoaded) return false; } utility::decodeDracoMeshes(gltf, prim, input->dracoCache);