Cleanup: use 'cb_flag', not 'cd_flag' for library_query callbacks.

`cd_flag` tends to be used for CustomData flags in mesh area, while for
library_query those are rather callback flags...

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 7350e014d43..6b4b492b212 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -274,9 +274,9 @@ void BKE_id_clear_newpoin(ID *id)
 }
 
 static int id_expand_local_callback(
-        void *UNUSED(user_data), struct ID *id_self, struct ID **id_pointer, int cd_flag)
+        void *UNUSED(user_data), struct ID *id_self, struct ID **id_pointer, int cb_flag)
 {
-	if (cd_flag & IDWALK_CB_PRIVATE) {
+	if (cb_flag & IDWALK_CB_PRIVATE) {
 		return IDWALK_RET_NOP;
 	}
 
@@ -1278,7 +1278,7 @@ void BKE_main_unlock(struct Main *bmain)
 }
 
 
-static int main_relations_create_cb(void *user_data, ID *id_self, ID **id_pointer, int cd_flag)
+static int main_relations_create_cb(void *user_data, ID *id_self, ID **id_pointer, int cb_flag)
 {
 	MainIDRelations *rel = user_data;
 
@@ -1293,7 +1293,7 @@ static int main_relations_create_cb(void *user_data, ID *id_self, ID **id_pointe
 			entry->next = NULL;
 		}
 		entry->id_pointer = id_pointer;
-		entry->usage_flag = cd_flag;
+		entry->usage_flag = cb_flag;
 		*entry_p = entry;
 
 		entry = BLI_mempool_alloc(rel->entry_pool);
@@ -1304,7 +1304,7 @@ static int main_relations_create_cb(void *user_data, ID *id_self, ID **id_pointe
 			entry->next = NULL;
 		}
 		entry->id_pointer = (ID **)id_self;
-		entry->usage_flag = cd_flag;
+		entry->usage_flag = cb_flag;
 		*entry_p = entry;
 	}