From 548c589e1ad065ecffafc84c60a3119468d98d41 Mon Sep 17 00:00:00 2001 From: Nia Bickford Date: Thu, 10 Sep 2026 19:01:49 +0200 Subject: [PATCH] Fix CMake warning about an old version; fix variable shadowing warning from MSVC Signed-off-by: Nia Bickford --- CMakeLists.txt | 2 +- tiny_gltf.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68b7e903..ead1e6a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.6...4.0.0) project(tinygltf) diff --git a/tiny_gltf.h b/tiny_gltf.h index 777fdef8..96753e40 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -9228,9 +9228,9 @@ static void SerializeGltfModel(const Model *model, detail::json &o) { detail::json externalAssets; detail::JsonReserveArray(externalAssets, model->externalAssets.size()); for (unsigned int i = 0; i < model->externalAssets.size(); ++i) { - detail::json asset; - SerializeGltfExternalAsset(model->externalAssets[i], asset); - detail::JsonPushBack(externalAssets, std::move(asset)); + detail::json externalAsset; + SerializeGltfExternalAsset(model->externalAssets[i], externalAsset); + detail::JsonPushBack(externalAssets, std::move(externalAsset)); } detail::JsonAddMember(o, "externalAssets", std::move(externalAssets)); }