blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cleanup: reserve C++ comments for disabled code

This commit is contained in:
Campbell Barton 2021-10-14 16:41:35 +11:00
parent 5fec6eda55
commit f12ea3d52e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenkernel/intern/asset_catalog.cc
View File

@ -243,7 +243,7 @@ void AssetCatalogService::load_from_disk(const CatalogFilePath &file_or_director
{
BLI_stat_t status;
if (BLI_stat(file_or_directory_path.data(), &status) == -1) {
// TODO(@sybren): throw an appropriate exception.
/* TODO(@sybren): throw an appropriate exception. */
return;
}
@ -254,7 +254,7 @@ void AssetCatalogService::load_from_disk(const CatalogFilePath &file_or_director
load_directory_recursive(file_or_directory_path);
}
else {
// TODO(@sybren): throw an appropriate exception.
/* TODO(@sybren): throw an appropriate exception. */
}
/* TODO: Should there be a sanitize step? E.g. to remove catalogs with identical paths? */
@ -264,8 +264,8 @@ void AssetCatalogService::load_from_disk(const CatalogFilePath &file_or_director
void AssetCatalogService::load_directory_recursive(const CatalogFilePath &directory_path)
{
// TODO(@sybren): implement proper multi-file support. For now, just load
// the default file if it is there.
/* TODO(@sybren): implement proper multi-file support. For now, just load
* the default file if it is there. */
CatalogFilePath file_path = asset_definition_default_file_path_from_dir(directory_path);
if (!BLI_exists(file_path.data())) {
@ -297,7 +297,7 @@ std::unique_ptr<AssetCatalogDefinitionFile> AssetCatalogService::parse_catalog_f
auto catalog_parsed_callback = [this, catalog_definition_file_path](
std::unique_ptr<AssetCatalog> catalog) {
if (catalog_collection_->catalogs_.contains(catalog->catalog_id)) {
// TODO(@sybren): apparently another CDF was already loaded. This is not supported yet.
/* TODO(@sybren): apparently another CDF was already loaded. This is not supported yet. */
std::cerr << catalog_definition_file_path << ": multiple definitions of catalog "
<< catalog->catalog_id << " in multiple files, ignoring this one." << std::endl;
/* Don't store 'catalog'; unique_ptr will free its memory. */
@ -805,16 +805,16 @@ bool AssetCatalogDefinitionFile::write_to_disk_unsafe(const CatalogFilePath &des
std::ofstream output(dest_file_path);
// TODO(@sybren): remember the line ending style that was originally read, then use that to write
// the file again.
/* TODO(@sybren): remember the line ending style that was originally read, then use that to write
* the file again. */
// Write the header.
/* Write the header. */
output << HEADER;
output << "" << std::endl;
output << VERSION_MARKER << SUPPORTED_VERSION << std::endl;
output << "" << std::endl;
// Write the catalogs, ordered by path (primary) and UUID (secondary).
/* Write the catalogs, ordered by path (primary) and UUID (secondary). */
AssetCatalogOrderedSet catalogs_by_path;
for (const AssetCatalog *catalog : catalogs_.values()) {
if (catalog->flags.is_deleted) {