[Bf-blender-cvs] [feaf846f939] master: Cleanup: get rid of -666 debug value.
Bastien Montagne
noreply at git.blender.org
Wed Jan 16 19:44:07 CET 2019
Commit: feaf846f93913840b523843c63ef67dfa82379cc
Author: Bastien Montagne
Date: Wed Jan 16 17:55:43 2019 +0100
Branches: master
https://developer.blender.org/rBfeaf846f93913840b523843c63ef67dfa82379cc
Cleanup: get rid of -666 debug value.
That one was used to allow specifying in system console a new path for
missing libraries, when loading a .blend file.
We now have a much more easy and user-friendly way of repairing missing
linked datablocks/libraries, so this is not needed anymore.
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ff79ba056e1..f8b8aa5bd21 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10841,7 +10841,6 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
FileData *fd = mainptr->curlib->filedata;
if (fd == NULL) {
-
/* printf and reports for now... its important users know this */
/* if packed file... */
@@ -10866,30 +10865,6 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
library_parent_filepath(mainptr->curlib));
fd = blo_openblenderfile(mainptr->curlib->filepath, basefd->reports);
}
- /* allow typing in a new lib path */
- if (G.debug_value == -666) {
- while (fd == NULL) {
- char newlib_path[FILE_MAX] = {0};
- printf("Missing library...'\n");
- printf("\tcurrent file: %s\n", BKE_main_blendfile_path_from_global());
- printf("\tabsolute lib: %s\n", mainptr->curlib->filepath);
- printf("\trelative lib: %s\n", mainptr->curlib->name);
- printf(" enter a new path:\n");
-
- if (scanf("%1023s", newlib_path) > 0) { /* Warning, keep length in sync with FILE_MAX! */
- BLI_strncpy(mainptr->curlib->name, newlib_path, sizeof(mainptr->curlib->name));
- BLI_strncpy(mainptr->curlib->filepath, newlib_path, sizeof(mainptr->curlib->filepath));
- BLI_cleanup_path(BKE_main_blendfile_path_from_global(), mainptr->curlib->filepath);
-
- fd = blo_openblenderfile(mainptr->curlib->filepath, basefd->reports);
-
- if (fd) {
- fd->mainlist = mainlist;
- printf("found: '%s', party on macuno!\n", mainptr->curlib->filepath);
- }
- }
- }
- }
if (fd) {
/* share the mainlist, so all libraries are added immediately in a
@@ -10913,7 +10888,6 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
#ifdef USE_GHASH_BHEAD
read_file_bhead_idname_map_create(fd);
#endif
-
}
else {
mainptr->curlib->filedata = NULL;
More information about the Bf-blender-cvs
mailing list