From 5c0661c7bb32d2fa580c6ca683e60fc452ac81ea Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Mon, 22 Apr 2024 13:59:15 -0700 Subject: [PATCH] gltfpack: Validate areMaterialsEqual correctness via a self check This improves coverage and will hopefully make sure areMaterialsEqual doesn't have obvious validity bugs where eg we compare two different fields accidentally. --- gltf/material.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gltf/material.cpp b/gltf/material.cpp index 7db0e20f..0ae2abf9 100644 --- a/gltf/material.cpp +++ b/gltf/material.cpp @@ -355,6 +355,8 @@ void mergeMeshMaterials(cgltf_data* data, std::vector& meshes, const Setti if (settings.keep_materials && data->materials[i].name && *data->materials[i].name) continue; + assert(areMaterialsEqual(data->materials[i], data->materials[i], settings)); + for (size_t j = 0; j < i; ++j) { if (settings.keep_materials && data->materials[j].name && *data->materials[j].name)