diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2017-06-24 23:09:08 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2017-06-24 23:16:47 +0300 |
commit | a2a301bdb96387b5b70ef82e5e9329ce1b5b5c75 (patch) | |
tree | 57d739b8190dc07df3744c64af2325b21207fb8d /source/blender/collada/ImageExporter.cpp | |
parent | 89060babbcd6099e0d53cf0164661d11a79369bd (diff) |
collada: change image export: export either UV Textures or Materials. This
avoids wrong texture data when multiple objects are exported. Note: This
commit might possiblyt not work fully. The full feature is added with the
next commit)
Diffstat (limited to 'source/blender/collada/ImageExporter.cpp')
-rw-r--r-- | source/blender/collada/ImageExporter.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/collada/ImageExporter.cpp index aac41e2e93c..a5ddd3fb990 100644 --- a/source/blender/collada/ImageExporter.cpp +++ b/source/blender/collada/ImageExporter.cpp @@ -232,11 +232,10 @@ void ImagesExporter::exportImages(Scene *sce) openLibrary(); MaterialFunctor mf; - if (this->export_settings->include_material_textures) { + if (this->export_settings->export_texture_type == BC_TEXTURE_TYPE_MAT) { mf.forEachMaterialInExportSet<ImagesExporter>(sce, *this, this->export_settings->export_set); } - - if (this->export_settings->include_uv_textures) { + else if (this->export_settings->export_texture_type == BC_TEXTURE_TYPE_UV) { export_UV_Images(); } |