diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-01-20 17:50:56 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-01-21 16:59:25 +0300 |
| commit | f817a11dc6088471ef60512967f793fadae45056 (patch) | |
| tree | 01f072c88f2aee4657859ca857f651aa9619f46c /source/blender/blenkernel/intern/main.c | |
| parent | 1135790ad53421acf4265d0467f122072ba1d858 (diff) | |
Cleanup: variable rename.
Avoid using two or three chars names when it's not absolutely obvious
what they mean.
Diffstat (limited to 'source/blender/blenkernel/intern/main.c')
| -rw-r--r-- | source/blender/blenkernel/intern/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/main.c b/source/blender/blenkernel/intern/main.c index 4b577ccec2c..5afa5890f14 100644 --- a/source/blender/blenkernel/intern/main.c +++ b/source/blender/blenkernel/intern/main.c @@ -211,7 +211,7 @@ void BKE_main_unlock(struct Main *bmain) static int main_relations_create_idlink_cb(LibraryIDLinkCallbackData *cb_data) { - MainIDRelations *rel = cb_data->user_data; + MainIDRelations *bmain_relations = cb_data->user_data; ID *id_self = cb_data->id_self; ID **id_pointer = cb_data->id_pointer; const int cb_flag = cb_data->cb_flag; @@ -219,8 +219,8 @@ static int main_relations_create_idlink_cb(LibraryIDLinkCallbackData *cb_data) if (*id_pointer) { MainIDRelationsEntry *entry, **entry_p; - entry = BLI_mempool_alloc(rel->entry_pool); - if (BLI_ghash_ensure_p(rel->id_user_to_used, id_self, (void ***)&entry_p)) { + entry = BLI_mempool_alloc(bmain_relations->entry_pool); + if (BLI_ghash_ensure_p(bmain_relations->id_user_to_used, id_self, (void ***)&entry_p)) { entry->next = *entry_p; } else { @@ -230,8 +230,8 @@ static int main_relations_create_idlink_cb(LibraryIDLinkCallbackData *cb_data) entry->usage_flag = cb_flag; *entry_p = entry; - entry = BLI_mempool_alloc(rel->entry_pool); - if (BLI_ghash_ensure_p(rel->id_used_to_user, *id_pointer, (void ***)&entry_p)) { + entry = BLI_mempool_alloc(bmain_relations->entry_pool); + if (BLI_ghash_ensure_p(bmain_relations->id_used_to_user, *id_pointer, (void ***)&entry_p)) { entry->next = *entry_p; } else { |