diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-01-31 12:41:25 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-01-31 12:41:25 +0300 |
commit | b5682a6fdd8a3ebbea1fd4a75c72fe8c9c3326c5 (patch) | |
tree | bef7ed6cd006a1b6e25856e1ad9876aa24eca50f /source/blender/blenkernel/intern/library_remap.c | |
parent | 60e387f5e3ae41c4b1e507f5aa4d8673a9f8765f (diff) |
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...
Diffstat (limited to 'source/blender/blenkernel/intern/library_remap.c')
-rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index 91896ebdc66..a408b498f18 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -689,9 +689,9 @@ void BKE_libblock_relink_ex( } } -static int id_relink_to_newid_looper(void *UNUSED(user_data), ID *UNUSED(self_id), ID **id_pointer, const int cd_flag) +static int id_relink_to_newid_looper(void *UNUSED(user_data), ID *UNUSED(self_id), ID **id_pointer, const int cb_flag) { - if (cd_flag & IDWALK_CB_PRIVATE) { + if (cb_flag & IDWALK_CB_PRIVATE) { return IDWALK_RET_NOP; } @@ -699,7 +699,7 @@ static int id_relink_to_newid_looper(void *UNUSED(user_data), ID *UNUSED(self_id if (id) { /* See: NEW_ID macro */ if (id->newid) { - BKE_library_update_ID_link_user(id->newid, id, cd_flag); + BKE_library_update_ID_link_user(id->newid, id, cb_flag); *id_pointer = id->newid; } else if (id->tag & LIB_TAG_NEW) { |