From 280d0e7f8ddbd7a67d0771ed2b5d9e22f205cd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Vanda=C3=ABle?= Date: Wed, 17 Sep 2025 08:37:30 +0200 Subject: [PATCH] MaterialAsset: Fix shadowed field --- Source/Core/VideoCommon/Assets/MaterialAsset.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Assets/MaterialAsset.cpp b/Source/Core/VideoCommon/Assets/MaterialAsset.cpp index 5f7b158334a..5f5c97a9f1b 100644 --- a/Source/Core/VideoCommon/Assets/MaterialAsset.cpp +++ b/Source/Core/VideoCommon/Assets/MaterialAsset.cpp @@ -222,7 +222,7 @@ bool MaterialData::FromJson(const CustomAssetLibrary::AssetID& asset_id, const picojson::object& json, MaterialData* data) { const auto parse_properties = [&](const char* name, - std::vector* properties) -> bool { + std::vector* material_properties) -> bool { const auto properties_iter = json.find(name); if (properties_iter == json.end()) { @@ -237,7 +237,7 @@ bool MaterialData::FromJson(const CustomAssetLibrary::AssetID& asset_id, } const auto& properties_array = properties_iter->second.get(); - if (!ParseMaterialProperties(asset_id, properties_array, properties)) + if (!ParseMaterialProperties(asset_id, properties_array, material_properties)) return false; return true; };