diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-09-15 02:31:26 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-09-15 02:31:26 +0400 |
| commit | a77d048f66dbc837cabe3dcefe070126647f3c8c (patch) | |
| tree | 6780c09ba72b3beaf7f2463735811d6faaf682e6 /source | |
| parent | c4de45e56b64c336ec4c00e564c97b4776f89cdc (diff) | |
Collada: #32549 partial fix: packed images now export correctly
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/collada/ImageExporter.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/collada/ImageExporter.cpp index 1af34bfa7b7..a15dadda8cf 100644 --- a/source/blender/collada/ImageExporter.cpp +++ b/source/blender/collada/ImageExporter.cpp @@ -74,6 +74,7 @@ void ImagesExporter::export_UV_Image(Image *image, bool use_copies) short image_source = image->source; bool is_generated = image_source == IMA_SRC_GENERATED; + bool is_packed = image->packedfile != NULL; char export_path[FILE_MAX]; char source_path[FILE_MAX]; @@ -83,7 +84,7 @@ void ImagesExporter::export_UV_Image(Image *image, bool use_copies) // Destination folder for exported assets BLI_split_dir_part(this->export_settings->filepath, export_dir, sizeof(export_dir)); - if (is_generated || is_dirty || use_copies) { + if (is_generated || is_dirty || use_copies || is_packed) { // make absolute destination path @@ -96,7 +97,7 @@ void ImagesExporter::export_UV_Image(Image *image, bool use_copies) BLI_make_existing_file(export_path); } - if (is_generated || is_dirty) { + if (is_generated || is_dirty || is_packed) { // This image in its current state only exists in Blender memory. // So we have to export it. The export will keep the image state intact, |