diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-06-24 02:03:31 +0400 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-06-24 02:03:31 +0400 |
commit | 8ef4c4762be16d9e2f4f3fc274009f294893cd2e (patch) | |
tree | 91b39b09726baf52c796db530e707c68a0255a86 /source/blender/collada/ImageExporter.cpp | |
parent | 870dba7657c7cc169a9d98695134f3ee8de8cd5b (diff) |
Added option for exporting material based textures. Cleaned up header files due to a bug in osx
Diffstat (limited to 'source/blender/collada/ImageExporter.cpp')
-rw-r--r-- | source/blender/collada/ImageExporter.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/collada/ImageExporter.cpp index d7bcfa8eed1..fbe7111bb58 100644 --- a/source/blender/collada/ImageExporter.cpp +++ b/source/blender/collada/ImageExporter.cpp @@ -98,7 +98,7 @@ void ImagesExporter::export_UV_Image(Image *image, bool use_copies) // So we have to export it. The export will keep the image state intact, // so the exported file will not be associated with the image. - if (BKE_imbuf_write_as(imbuf, export_path, &imageFormat, true) != 0) { + if (BKE_imbuf_write_as(imbuf, export_path, &imageFormat, true) == 0) { fprintf(stderr, "Collada export: Cannot export image to:\n%s\n", export_path); } BLI_strncpy(export_path, export_file, sizeof(export_path)); @@ -215,7 +215,9 @@ void ImagesExporter::exportImages(Scene *sce) openLibrary(); MaterialFunctor mf; - mf.forEachMaterialInExportSet<ImagesExporter>(sce, *this, this->export_settings->export_set); + if (this->export_settings->include_material_textures) { + mf.forEachMaterialInExportSet<ImagesExporter>(sce, *this, this->export_settings->export_set); + } if (this->export_settings->include_uv_textures) { export_UV_Images(); |