archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: remove unreachable return values

Browse Source
This commit is contained in:
Campbell Barton
2023-02-03 20:02:25 +11:00
parent 307113d744
commit 2fb0c20f53
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/editors/space_file/filelist.cc
View File

@@ -2233,46 +2233,40 @@ static bool filelist_file_cache_block_create(FileList *filelist,
{ {
FileListEntryCache *cache = &filelist->filelist_cache; FileListEntryCache *cache = &filelist->filelist_cache;
{ int i, idx;
int i, idx;
for (i = 0, idx = start_index; i < size; i++, idx++, cursor++) { for (i = 0, idx = start_index; i < size; i++, idx++, cursor++) {
FileDirEntry *entry; FileDirEntry *entry;
/* That entry might have already been requested and stored in misc cache... */ /* That entry might have already been requested and stored in misc cache... */
if ((entry = static_cast<FileDirEntry *>(BLI_ghash_popkey( if ((entry = static_cast<FileDirEntry *>(
cache->misc_entries, POINTER_FROM_INT(idx), nullptr))) == nullptr) { BLI_ghash_popkey(cache->misc_entries, POINTER_FROM_INT(idx), nullptr))) == nullptr) {
entry = filelist_file_create_entry(filelist, idx); entry = filelist_file_create_entry(filelist, idx);
BLI_ghash_insert(cache->uids, POINTER_FROM_UINT(entry->uid), entry); BLI_ghash_insert(cache->uids, POINTER_FROM_UINT(entry->uid), entry);
}
cache->block_entries[cursor] = entry;
} }
return true; cache->block_entries[cursor] = entry;
} }
return true;
return false;
} }
static void filelist_file_cache_block_release(FileList *filelist, const int size, int cursor) static void filelist_file_cache_block_release(FileList *filelist, const int size, int cursor)
{ {
FileListEntryCache *cache = &filelist->filelist_cache; FileListEntryCache *cache = &filelist->filelist_cache;
{ int i;
int i;
for (i = 0; i < size; i++, cursor++) { for (i = 0; i < size; i++, cursor++) {
FileDirEntry *entry = cache->block_entries[cursor]; FileDirEntry *entry = cache->block_entries[cursor];
#if 0 #if 0
printf("%s: release cacheidx %d (%%p %%s)\n", printf("%s: release cacheidx %d (%%p %%s)\n",
__func__, __func__,
cursor /*, cache->block_entries[cursor], cache->block_entries[cursor]->relpath*/); cursor /*, cache->block_entries[cursor], cache->block_entries[cursor]->relpath*/);
#endif #endif
BLI_ghash_remove(cache->uids, POINTER_FROM_UINT(entry->uid), nullptr, nullptr); BLI_ghash_remove(cache->uids, POINTER_FROM_UINT(entry->uid), nullptr, nullptr);
filelist_file_release_entry(filelist, entry); filelist_file_release_entry(filelist, entry);
#ifndef NDEBUG #ifndef NDEBUG
cache->block_entries[cursor] = nullptr; cache->block_entries[cursor] = nullptr;
#endif #endif
}
} }
} }

2
source/blender/modifiers/intern/MOD_particleinstance.cc
View File

@@ -180,8 +180,6 @@ static bool particle_skip(ParticleInstanceModifierData *pimd, ParticleSystem *ps
} }
return true; return true;
return false;
} }
static void store_float_in_vcol(MLoopCol *vcol, float float_value) static void store_float_in_vcol(MLoopCol *vcol, float float_value)