Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Bastien Montagne
2018-05-10 14:27:24 +02:00
parent 27da2db0ca 0385b33f0b
commit c20cc3cf14
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/library.c
View File

@@ -2526,7 +2526,9 @@ void BKE_library_filepath_set(Library *lib, const char *filepath)
* outliner, and its not really supported but allow from here for now * outliner, and its not really supported but allow from here for now
* since making local could cause this to be directly linked - campbell * since making local could cause this to be directly linked - campbell
*/ */
const char *basepath = lib->parent ? lib->parent->filepath : G.main->name; /* Never make paths relative to parent lib - reading code (blenloader) always set *all* lib->name relative to
* current G.main, not to their parent for indirectly linked ones. */
const char *basepath = G.main->name;
BLI_path_abs(lib->filepath, basepath); BLI_path_abs(lib->filepath, basepath);
} }
} }

2
source/blender/blenloader/intern/blend_validate.c
View File

@@ -85,6 +85,8 @@ bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports)
BlendHandle *bh = BLO_blendhandle_from_file(curlib->filepath, reports); BlendHandle *bh = BLO_blendhandle_from_file(curlib->filepath, reports);
if (bh == NULL) { if (bh == NULL) {
BKE_reportf(reports, RPT_ERROR,
"Library ID %s not found at expected path %s!\n", curlib->id.name, curlib->filepath);
continue; continue;
} }