diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-18 23:35:13 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-18 23:35:13 +0400 |
| commit | 01750b1e4bfba0eee071a18327203a37ffe24b00 (patch) | |
| tree | d4fbe41ae0dade9953c559a5b94e79169392b81a /source/blender/blenkernel/intern/bpath.c | |
| parent | 996add7885a3f5908c9315948c0cf147584174ea (diff) | |
Fix warnings message on load about packed images:
ERROR: Image not available. Keeping packed image
This was due to recent bugfix for #36639, the image should only be reloaded if
the path actually changed and it's not a packed file.
Diffstat (limited to 'source/blender/blenkernel/intern/bpath.c')
| -rw-r--r-- | source/blender/blenkernel/intern/bpath.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c index 30dc7514eaf..b7a6cf4153a 100644 --- a/source/blender/blenkernel/intern/bpath.c +++ b/source/blender/blenkernel/intern/bpath.c @@ -422,9 +422,12 @@ void BKE_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int ima = (Image *)id; if (ima->packedfile == NULL || (flag & BKE_BPATH_TRAVERSE_SKIP_PACKED) == 0) { if (ELEM3(ima->source, IMA_SRC_FILE, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) { - rewrite_path_fixed(ima->name, visit_cb, absbase, bpath_user_data); - BKE_image_signal(ima, NULL, IMA_SIGNAL_RELOAD); - BKE_image_walk_all_users(bmain, ima, bpath_traverse_image_user_cb); + if (rewrite_path_fixed(ima->name, visit_cb, absbase, bpath_user_data)) { + if (!ima->packedfile) { + BKE_image_signal(ima, NULL, IMA_SIGNAL_RELOAD); + BKE_image_walk_all_users(bmain, ima, bpath_traverse_image_user_cb); + } + } } } break; |