diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-06-23 02:54:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-23 04:29:36 +0300 |
commit | 716a8241d387180fd8ad69cdec33633bc7a0f963 (patch) | |
tree | d4674969beacfa6f9d50726f5943e050a373f2b5 /source/blender/blenloader/intern/blend_validate.c | |
parent | a573d7e8a14ce5e49b8c05ff762a00e181e905aa (diff) |
Cleanup: rename 'name' to 'filepath' for DNA types
Using 'name' for the full path of a file reads badly,
especially when id.name is used in related code.
Diffstat (limited to 'source/blender/blenloader/intern/blend_validate.c')
-rw-r--r-- | source/blender/blenloader/intern/blend_validate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/blend_validate.c b/source/blender/blenloader/intern/blend_validate.c index 133811bdc01..0a5d8d332aa 100644 --- a/source/blender/blenloader/intern/blend_validate.c +++ b/source/blender/blenloader/intern/blend_validate.c @@ -70,7 +70,7 @@ bool BLO_main_validate_libraries(Main *bmain, ReportList *reports) RPT_ERROR, "ID %s is in local database while being linked from library %s!", id->name, - id->lib->name); + id->lib->filepath); } } } @@ -82,7 +82,7 @@ bool BLO_main_validate_libraries(Main *bmain, ReportList *reports) continue; } - BKE_library_filepath_set(bmain, curlib, curlib->name); + BKE_library_filepath_set(bmain, curlib, curlib->filepath); BlendHandle *bh = BLO_blendhandle_from_file(curlib->filepath_abs, reports); if (bh == NULL) { @@ -107,7 +107,7 @@ bool BLO_main_validate_libraries(Main *bmain, ReportList *reports) RPT_ERROR, "Library ID %s in library %s, this should not happen!", id->name, - curlib->name); + curlib->filepath); continue; } @@ -120,7 +120,7 @@ bool BLO_main_validate_libraries(Main *bmain, ReportList *reports) RPT_ERROR, "ID %s has NULL lib pointer while being in library %s!", id->name, - curlib->name); + curlib->filepath); continue; } if (id->lib != curlib) { @@ -143,7 +143,7 @@ bool BLO_main_validate_libraries(Main *bmain, ReportList *reports) RPT_ERROR, "ID %s not found in library %s anymore!", id->name, - id->lib->name); + id->lib->filepath); continue; } } |