diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2021-11-30 12:56:14 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2021-11-30 12:56:14 +0300 |
| commit | bc1e3238c453a91a34d280031af18b1601cd94b0 (patch) | |
| tree | c9df3e3b5ac0bf4434ff095af7c8d55de375725d /source/blender/blenkernel/intern/bpath.c | |
| parent | d7f0de0e3aea23afba286297ab98ebdd86a41507 (diff) | |
| parent | c12d8a72cef557c0d9c76e78c3754e3009e74efd (diff) | |
Merge remote-tracking branch 'origin/blender-v3.0-release'
This includes adjustment of rBc12d8a72cef5 to the new path traversal code
introduced in rBe5e8db73df86.
Diffstat (limited to 'source/blender/blenkernel/intern/bpath.c')
| -rw-r--r-- | source/blender/blenkernel/intern/bpath.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c index cea21d2a946..85e49774dfd 100644 --- a/source/blender/blenkernel/intern/bpath.c +++ b/source/blender/blenkernel/intern/bpath.c @@ -103,7 +103,8 @@ void BKE_bpath_foreach_path_id(BPathForeachPathData *bpath_data, ID *id) return; } - if (id->library_weak_reference != NULL) { + if (id->library_weak_reference != NULL && + (flag & BKE_BPATH_TRAVERSE_SKIP_WEAK_REFERENCES) == 0) { BKE_bpath_foreach_path_fixed_process(bpath_data, id->library_weak_reference->library_filepath); } |