summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Assets/MaterialAsset.cpp
diff options
context:
space:
mode:
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;
};