summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Assets/MaterialAsset.cpp
diff options
context:
space:
mode:
authorJoshua Vandaƫle <joshua@vandaele.software>2025-09-17 08:37:30 +0200
committerJoshua Vandaƫle <joshua@vandaele.software>2025-10-29 11:12:31 +0100
commit280d0e7f8ddbd7a67d0771ed2b5d9e22f205cd4c (patch)
tree075b2da5240aa1ebca9331dbf8243cc3cfe62a71 /Source/Core/VideoCommon/Assets/MaterialAsset.cpp
parentb920182c97703b3df0fcb44cebdd6d1cc5485fcc (diff)
MaterialAsset: Fix shadowed field
Diffstat (limited to 'Source/Core/VideoCommon/Assets/MaterialAsset.cpp')
-rw-r--r--Source/Core/VideoCommon/Assets/MaterialAsset.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/Assets/MaterialAsset.cpp b/Source/Core/VideoCommon/Assets/MaterialAsset.cpp
index 5f7b158334..5f5c97a9f1 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<MaterialProperty>* properties) -> bool {
+ std::vector<MaterialProperty>* 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<picojson::array>();
- if (!ParseMaterialProperties(asset_id, properties_array, properties))
+ if (!ParseMaterialProperties(asset_id, properties_array, material_properties))
return false;
return true;
};