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

Cleanup: variable rename. 

Avoid using two or three chars names when it's not absolutely obvious
what they mean.
This commit is contained in:
Bastien Montagne 2021-01-20 15:50:56 +01:00
parent 1135790ad5
commit f817a11dc6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/main.c
View File

@ -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 {