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/editors/asset | |
| 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/editors/asset')
| -rw-r--r-- | source/blender/editors/asset/intern/asset_ops.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/asset/intern/asset_ops.cc b/source/blender/editors/asset/intern/asset_ops.cc index 6e81908c24e..c7644288959 100644 --- a/source/blender/editors/asset/intern/asset_ops.cc +++ b/source/blender/editors/asset/intern/asset_ops.cc @@ -906,8 +906,9 @@ static bool has_external_files(Main *bmain, struct ReportList *reports) struct FileCheckCallbackInfo callback_info = {reports, false}; eBPathForeachFlag flag = static_cast<eBPathForeachFlag>( - BKE_BPATH_FOREACH_PATH_SKIP_PACKED /* Packed files are fine. */ - | BKE_BPATH_FOREACH_PATH_SKIP_MULTIFILE); /* Only report multi-files once, it's enough. */ + BKE_BPATH_FOREACH_PATH_SKIP_PACKED /* Packed files are fine. */ + | BKE_BPATH_FOREACH_PATH_SKIP_MULTIFILE /* Only report multi-files once, it's enough. */ + | BKE_BPATH_TRAVERSE_SKIP_WEAK_REFERENCES); /* Only care about actually used files. */ BPathForeachPathData bpath_data = { /* bmain */ bmain, |