dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-16 04:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MaterialAsset: Fix shadowed field

Browse Source
This commit is contained in:
Joshua Vandaële 2025-09-17 08:37:30 +02:00
parent b920182c97
commit 280d0e7f8d
No known key found for this signature in database
GPG Key ID: 6BB95AF71EB0F406
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/Assets/MaterialAsset.cpp
View File

@ -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;
};