diff --git a/source/blender/asset_system/intern/asset_catalog.cc b/source/blender/asset_system/intern/asset_catalog.cc index 1ea12295414..bfde13187db 100644 --- a/source/blender/asset_system/intern/asset_catalog.cc +++ b/source/blender/asset_system/intern/asset_catalog.cc @@ -317,7 +317,7 @@ static std::string asset_definition_default_file_path_from_dir(StringRef asset_l void AssetCatalogService::load_from_disk() { - load_from_disk(asset_library_root_); + this->load_from_disk(asset_library_root_); } void AssetCatalogService::load_from_disk(const CatalogFilePath &file_or_directory_path) @@ -330,10 +330,10 @@ void AssetCatalogService::load_from_disk(const CatalogFilePath &file_or_director } if (S_ISREG(status.st_mode)) { - load_single_file(file_or_directory_path); + this->load_single_file(file_or_directory_path); } else if (S_ISDIR(status.st_mode)) { - load_directory_recursive(file_or_directory_path); + this->load_directory_recursive(file_or_directory_path); } else { /* TODO(@sybren): throw an appropriate exception. */ @@ -341,7 +341,7 @@ void AssetCatalogService::load_from_disk(const CatalogFilePath &file_or_director /* TODO: Should there be a sanitize step? E.g. to remove catalogs with identical paths? */ - rebuild_tree(); + this->rebuild_tree(); } void AssetCatalogService::add_from_existing(const AssetCatalogService &other_service) @@ -423,7 +423,7 @@ void AssetCatalogService::reload_catalogs() const CatalogID catalog_id = catalog->catalog_id; cats_in_file.add(catalog_id); - const bool should_skip = is_catalog_known_with_unsaved_changes(catalog_id); + const bool should_skip = this->is_catalog_known_with_unsaved_changes(catalog_id); if (should_skip) { /* Do not overwrite unsaved local changes. */ return false; @@ -447,7 +447,7 @@ void AssetCatalogService::purge_catalogs_not_listed(const Set &catalo if (catalogs_to_keep.contains(cat_id)) { continue; } - if (is_catalog_known_with_unsaved_changes(cat_id)) { + if (this->is_catalog_known_with_unsaved_changes(cat_id)) { continue; } /* This catalog is not on disk, but also not modified, so get rid of it. */ @@ -455,7 +455,7 @@ void AssetCatalogService::purge_catalogs_not_listed(const Set &catalo } for (CatalogID cat_id : cats_to_remove) { - delete_catalog_by_id_hard(cat_id); + this->delete_catalog_by_id_hard(cat_id); } } @@ -481,12 +481,12 @@ bool AssetCatalogService::write_to_disk(const CatalogFilePath &blend_file_path) { BLI_assert(!is_read_only_); - if (!write_to_disk_ex(blend_file_path)) { + if (!this->write_to_disk_ex(blend_file_path)) { return false; } - untag_has_unsaved_changes(); - rebuild_tree(); + this->untag_has_unsaved_changes(); + this->rebuild_tree(); return true; } @@ -496,7 +496,7 @@ bool AssetCatalogService::write_to_disk_ex(const CatalogFilePath &blend_file_pat /* - Already loaded a CDF from disk? -> Always write to that file. */ if (catalog_collection_->catalog_definition_file_) { - reload_catalogs(); + this->reload_catalogs(); return catalog_collection_->catalog_definition_file_->write_to_disk(); } @@ -507,9 +507,10 @@ bool AssetCatalogService::write_to_disk_ex(const CatalogFilePath &blend_file_pat return true; /* Writing nothing when there is nothing to write is still a success. */ } - const CatalogFilePath cdf_path_to_write = find_suitable_cdf_path_for_writing(blend_file_path); - catalog_collection_->catalog_definition_file_ = construct_cdf_in_memory(cdf_path_to_write); - reload_catalogs(); + const CatalogFilePath cdf_path_to_write = this->find_suitable_cdf_path_for_writing( + blend_file_path); + catalog_collection_->catalog_definition_file_ = this->construct_cdf_in_memory(cdf_path_to_write); + this->reload_catalogs(); return catalog_collection_->catalog_definition_file_->write_to_disk(); } @@ -528,7 +529,7 @@ void AssetCatalogService::prepare_to_merge_on_write() /* Mark all in-memory catalogs as "dirty", to force them to be kept around on * the next "load-merge-write" cycle. */ - tag_all_catalogs_as_unsaved_changes(); + this->tag_all_catalogs_as_unsaved_changes(); } CatalogFilePath AssetCatalogService::find_suitable_cdf_path_for_writing( @@ -590,8 +591,8 @@ std::unique_ptr AssetCatalogService::read_into_tree() void AssetCatalogService::rebuild_tree() { - create_missing_catalogs(); - this->catalog_tree_ = read_into_tree(); + this->create_missing_catalogs(); + this->catalog_tree_ = this->read_into_tree(); } void AssetCatalogService::create_missing_catalogs() @@ -661,7 +662,7 @@ void AssetCatalogService::redo() undo_snapshots_.append(std::move(catalog_collection_)); catalog_collection_ = redo_snapshots_.pop_last(); - rebuild_tree(); + this->rebuild_tree(); AssetLibraryService::get()->rebuild_all_library(); } diff --git a/source/blender/asset_system/intern/asset_library_service.cc b/source/blender/asset_system/intern/asset_library_service.cc index aa03edd37af..b14b587bf4c 100644 --- a/source/blender/asset_system/intern/asset_library_service.cc +++ b/source/blender/asset_system/intern/asset_library_service.cc @@ -74,7 +74,7 @@ AssetLibrary *AssetLibraryService::get_asset_library( return nullptr; } - return get_asset_library_on_disk_builtin(type, root_path); + return this->get_asset_library_on_disk_builtin(type, root_path); } case ASSET_LIBRARY_LOCAL: { /* For the "Current File" library we get the asset library root path based on main. */ @@ -83,14 +83,14 @@ AssetLibrary *AssetLibraryService::get_asset_library( if (root_path.empty()) { /* File wasn't saved yet. */ - return get_asset_library_current_file(); + return this->get_asset_library_current_file(); } - return get_asset_library_on_disk_builtin(type, root_path); + return this->get_asset_library_on_disk_builtin(type, root_path); } case ASSET_LIBRARY_ALL: - return get_asset_library_all(bmain); + return this->get_asset_library_all(bmain); case ASSET_LIBRARY_CUSTOM: { - bUserAssetLibrary *custom_library = find_custom_asset_library_from_library_ref( + bUserAssetLibrary *custom_library = this->find_custom_asset_library_from_library_ref( library_reference); if (!custom_library) { return nullptr; @@ -101,7 +101,8 @@ AssetLibrary *AssetLibraryService::get_asset_library( return nullptr; } - AssetLibrary *library = get_asset_library_on_disk_custom(custom_library->name, root_path); + AssetLibrary *library = this->get_asset_library_on_disk_custom(custom_library->name, + root_path); library->import_method_ = eAssetImportMethod(custom_library->import_method); library->may_override_import_method_ = true; library->use_relative_path_ = (custom_library->flag & ASSET_LIBRARY_RELATIVE_PATH) != 0; @@ -156,7 +157,7 @@ AssetLibrary *AssetLibraryService::get_asset_library_on_disk(eAssetLibraryType l AssetLibrary *AssetLibraryService::get_asset_library_on_disk_custom(StringRef name, StringRefNull root_path) { - return get_asset_library_on_disk(ASSET_LIBRARY_CUSTOM, name, root_path); + return this->get_asset_library_on_disk(ASSET_LIBRARY_CUSTOM, name, root_path); } AssetLibrary *AssetLibraryService::get_asset_library_on_disk_builtin(eAssetLibraryType type, @@ -168,7 +169,7 @@ AssetLibrary *AssetLibraryService::get_asset_library_on_disk_builtin(eAssetLibra /* Builtin asset libraries don't need a name, the #eAssetLibraryType is enough to identify them * (and doesn't change, unlike the name). */ - return get_asset_library_on_disk(type, {}, root_path); + return this->get_asset_library_on_disk(type, {}, root_path); } AssetLibrary *AssetLibraryService::get_asset_library_current_file() @@ -203,7 +204,7 @@ AssetLibrary *AssetLibraryService::get_asset_library_all(const Main *bmain) } /* Ensure all asset libraries are loaded. */ - get_asset_library(bmain, library_ref); + this->get_asset_library(bmain, library_ref); } if (all_library_) { @@ -249,8 +250,8 @@ std::string AssetLibraryService::resolve_asset_weak_reference_to_library_path( switch (eAssetLibraryType(asset_reference.asset_library_type)) { case ASSET_LIBRARY_CUSTOM: { - bUserAssetLibrary *custom_lib = find_custom_preferences_asset_library_from_asset_weak_ref( - asset_reference); + bUserAssetLibrary *custom_lib = + this->find_custom_preferences_asset_library_from_asset_weak_ref(asset_reference); if (custom_lib) { library_dirpath = custom_lib->dirpath; break; @@ -258,7 +259,7 @@ std::string AssetLibraryService::resolve_asset_weak_reference_to_library_path( /* A bit of an odd-ball, the API supports loading custom libraries from arbitrary paths (used * by unit tests). So check all loaded on-disk libraries too. */ - AssetLibrary *loaded_custom_lib = find_loaded_on_disk_asset_library_from_name( + AssetLibrary *loaded_custom_lib = this->find_loaded_on_disk_asset_library_from_name( asset_reference.asset_library_identifier); if (!loaded_custom_lib) { return ""; @@ -368,7 +369,7 @@ std::optional AssetLibraryService:: switch (eAssetLibraryType(asset_reference.asset_library_type)) { case ASSET_LIBRARY_LOCAL: { - std::string path_in_file = normalize_asset_weak_reference_relative_asset_identifier( + std::string path_in_file = this->normalize_asset_weak_reference_relative_asset_identifier( asset_reference); const int64_t group_len = int64_t(path_in_file.find(SEP)); @@ -381,14 +382,14 @@ std::optional AssetLibraryService:: } case ASSET_LIBRARY_CUSTOM: case ASSET_LIBRARY_ESSENTIALS: { - std::string full_path = resolve_asset_weak_reference_to_full_path(asset_reference); + std::string full_path = this->resolve_asset_weak_reference_to_full_path(asset_reference); /* #full_path uses native slashes, so others don't need to be considered in the following. */ if (full_path.empty()) { return std::nullopt; } - int64_t blendfile_extension_pos = rfind_blendfile_extension(full_path); + int64_t blendfile_extension_pos = this->rfind_blendfile_extension(full_path); BLI_assert(blendfile_extension_pos != StringRef::not_found); size_t group_pos = full_path.find(SEP, blendfile_extension_pos);