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/EffectExporter.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/EffectExporter.cpp')
| -rw-r--r-- | source/blender/collada/EffectExporter.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index aee4f00b31c..f11ecc7f16d 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -173,7 +173,8 @@ void EffectsExporter::operator()(Material *ma, Object *ob) { // create a list of indices to textures of type TEX_IMAGE std::vector<int> tex_indices; - createTextureIndices(ma, tex_indices); + if(this->export_settings->include_material_textures) + createTextureIndices(ma, tex_indices); openEffect(translate_id(id_name(ma)) + "-effect"); @@ -309,7 +310,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob) std::set<Image *> uv_textures; - if (ob->type == OB_MESH && ob->totcol) { + if (ob->type == OB_MESH && ob->totcol && this->export_settings->include_uv_textures) { Mesh *me = (Mesh *) ob->data; BKE_mesh_tessface_ensure(me); for (int i = 0; i < me->pdata.totlayer; i++) { |