Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 10 May 2018 12:27:24 +0000 (14:27 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 10 May 2018 12:27:24 +0000 (14:27 +0200)
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/blend_validate.c

index 2e56ed9d2474bbab603d001f6fe160a1167cff2a..a2bd8eeea95010757af0977c83f7663ffe3d5079 100644 (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
                 * 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);
        }
 }
index d155fcfaa0df933b74e4c68374826bc114a284c1..0963fdd78e0f6c054b52c3b25a21b9a2cb778deb 100644 (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);
 
                if (bh == NULL) {
+                       BKE_reportf(reports, RPT_ERROR,
+                                   "Library ID %s not found at expected path %s!\n", curlib->id.name, curlib->filepath);
                        continue;
                }