diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/lib_id_remapper.cc | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/lib_remap.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/lib_id_remapper.cc b/source/blender/blenkernel/intern/lib_id_remapper.cc index 7696386c87d..7e75e0f5d93 100644 --- a/source/blender/blenkernel/intern/lib_id_remapper.cc +++ b/source/blender/blenkernel/intern/lib_id_remapper.cc @@ -86,7 +86,8 @@ struct IDRemapper { } if (options & ID_REMAP_APPLY_UPDATE_REFCOUNT) { - id_us_plus(*r_id_ptr); + /* Do not handle LIB_TAG_INDIRECT/LIB_TAG_EXTERN here. */ + id_us_plus_no_lib(*r_id_ptr); } if (options & ID_REMAP_APPLY_ENSURE_REAL) { diff --git a/source/blender/blenkernel/intern/lib_remap.c b/source/blender/blenkernel/intern/lib_remap.c index 2b449ad50bb..3f40c9d2088 100644 --- a/source/blender/blenkernel/intern/lib_remap.c +++ b/source/blender/blenkernel/intern/lib_remap.c @@ -131,8 +131,8 @@ static void foreach_libblock_remap_callback_apply(ID *id_owner, id_us_min(old_id); } if (new_id != NULL && (force_user_refcount || (new_id->tag & LIB_TAG_NO_MAIN) == 0)) { - /* We do not want to handle LIB_TAG_INDIRECT/LIB_TAG_EXTERN here. */ - new_id->us++; + /* Do not handle LIB_TAG_INDIRECT/LIB_TAG_EXTERN here. */ + id_us_plus_no_lib(new_id); } } else if (cb_flag & IDWALK_CB_USER_ONE) { |