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/EffectExporter.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/EffectExporter.cpp')
| -rw-r--r-- | source/blender/collada/EffectExporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index 76b51148509..4ce88d96888 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -176,7 +176,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob) { // create a list of indices to textures of type TEX_IMAGE std::vector<int> tex_indices; - if (this->export_settings->include_material_textures) + if (this->export_settings->export_texture_type == BC_TEXTURE_TYPE_MAT) createTextureIndices(ma, tex_indices); openEffect(translate_id(id_name(ma)) + "-effect"); @@ -313,7 +313,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob) int active_uv_layer = -1; std::set<Image *> uv_textures; - if (ob->type == OB_MESH && ob->totcol && this->export_settings->include_uv_textures) { + if (ob->type == OB_MESH && ob->totcol && this->export_settings->export_texture_type == BC_TEXTURE_TYPE_UV) { bool active_uv_only = this->export_settings->active_uv_only; Mesh *me = (Mesh *) ob->data; active_uv_layer = CustomData_get_active_layer_index(&me->pdata, CD_MTEXPOLY); |