blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Cleanup: Missing trailing underscore in private asset system member vars 

See style guide:
https://wiki.blender.org/wiki/Style_Guide/C_Cpp#Class_data_member_names
This commit is contained in:
Julian Eisel 2022-11-18 12:43:33 +01:00
parent d5c8d3e661
commit 754f674977
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/asset_system/AS_asset_catalog.hh
View File

@ -424,8 +424,8 @@ using MutableAssetCatalogOrderedSet = std::set<AssetCatalog *, AssetCatalogLessT
* \see AssetCatalogService::create_catalog_filter()
*/
class AssetCatalogFilter {
const Set<CatalogID> matching_catalog_ids;
const Set<CatalogID> known_catalog_ids;
const Set<CatalogID> matching_catalog_ids_;
const Set<CatalogID> known_catalog_ids_;
friend AssetCatalogService;

8
source/blender/asset_system/intern/asset_catalog.cc
View File

@ -960,14 +960,14 @@ std::string AssetCatalog::sensible_simple_name_for_path(const AssetCatalogPath &
AssetCatalogFilter::AssetCatalogFilter(Set<CatalogID> &&matching_catalog_ids,
Set<CatalogID> &&known_catalog_ids)
: matching_catalog_ids(std::move(matching_catalog_ids)),
known_catalog_ids(std::move(known_catalog_ids))
: matching_catalog_ids_(std::move(matching_catalog_ids)),
known_catalog_ids_(std::move(known_catalog_ids))
{
}
bool AssetCatalogFilter::contains(const CatalogID asset_catalog_id) const
{
return matching_catalog_ids.contains(asset_catalog_id);
return matching_catalog_ids_.contains(asset_catalog_id);
}
bool AssetCatalogFilter::is_known(const CatalogID asset_catalog_id) const
@ -975,7 +975,7 @@ bool AssetCatalogFilter::is_known(const CatalogID asset_catalog_id) const
if (BLI_uuid_is_nil(asset_catalog_id)) {
return false;
}
return known_catalog_ids.contains(asset_catalog_id);
return known_catalog_ids_.contains(asset_catalog_id);
}
} // namespace blender::asset_system