[Bf-blender-cvs] [374e412813c] master: Correct recent 'name' -> 'filepath' rename (missed Collada)
Campbell Barton
noreply at git.blender.org
Tue Jun 23 06:59:27 CEST 2020
Commit: 374e412813ca1752fc5e4b5bb2915d69cf872cf4
Author: Campbell Barton
Date: Tue Jun 23 14:58:38 2020 +1000
Branches: master
https://developer.blender.org/rB374e412813ca1752fc5e4b5bb2915d69cf872cf4
Correct recent 'name' -> 'filepath' rename (missed Collada)
===================================================================
M source/blender/io/collada/ImageExporter.cpp
===================================================================
diff --git a/source/blender/io/collada/ImageExporter.cpp b/source/blender/io/collada/ImageExporter.cpp
index 1c897e37a4a..51d753db03f 100644
--- a/source/blender/io/collada/ImageExporter.cpp
+++ b/source/blender/io/collada/ImageExporter.cpp
@@ -55,7 +55,7 @@ void ImagesExporter::export_UV_Image(Image *image, bool use_copies)
ImBuf *imbuf = BKE_image_acquire_ibuf(image, NULL, NULL);
if (!imbuf) {
- fprintf(stderr, "Collada export: image does not exist:\n%s\n", image->name);
+ fprintf(stderr, "Collada export: image does not exist:\n%s\n", image->filepath);
return;
}
@@ -104,7 +104,7 @@ void ImagesExporter::export_UV_Image(Image *image, bool use_copies)
else {
/* make absolute source path */
- BLI_strncpy(source_path, image->name, sizeof(source_path));
+ BLI_strncpy(source_path, image->filepath, sizeof(source_path));
BLI_path_abs(source_path, ID_BLEND_PATH_FROM_GLOBAL(&image->id));
BLI_path_normalize(NULL, source_path);
More information about the Bf-blender-cvs
mailing list