diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-10-04 00:03:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-04 00:03:53 +0300 |
| commit | fbc096cf075b65981bfb766353b002686a847503 (patch) | |
| tree | f7aa1eb152c73be87c5f219263f450df6a03ee36 /source/blender/blenkernel/intern/image.c | |
| parent | 8096190d11d6caf5facfc266791a08985179688a (diff) | |
Fix expanding paths ignoring data-block libraries
- Image views.
- Sequencer text strip font.
- Text check for modified/reload.
- Collada image export.
- Brush icons.
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index bc682ffb8c8..332549c6b47 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -569,7 +569,7 @@ Image *BKE_image_load_exists_ex(Main *bmain, const char *filepath, bool *r_exist char str[FILE_MAX], strtest[FILE_MAX]; STRNCPY(str, filepath); - BLI_path_abs(str, BKE_main_blendfile_path_from_global()); + BLI_path_abs(str, bmain->name); /* first search an identical filepath */ for (ima = bmain->images.first; ima; ima = ima->id.next) { @@ -5310,7 +5310,7 @@ static void image_update_views_format(Image *ima, ImageUser *iuser) char str[FILE_MAX]; STRNCPY(str, iv->filepath); - BLI_path_abs(str, BKE_main_blendfile_path_from_global()); + BLI_path_abs(str, ID_BLEND_PATH_FROM_GLOBAL(&ima->id)); /* exists? */ file = BLI_open(str, O_BINARY | O_RDONLY, 0); |