[Bf-blender-cvs] [f817a11dc60] master: Cleanup: variable rename.

[Bastien Montagne]

Commit: f817a11dc6088471ef60512967f793fadae45056
Author: Bastien Montagne
Date:   Wed Jan 20 15:50:56 2021 +0100
Branches: master
https://developer.blender.org/rBf817a11dc6088471ef60512967f793fadae45056

Cleanup: variable rename.

Avoid using two or three chars names when it's not absolutely obvious
what they mean.

===================================================================

M	source/blender/blenkernel/intern/main.c

===================================================================

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 {