Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2012-06-24 02:03:31 +0400
committerGaia Clary <gaia.clary@machinimatrix.org>2012-06-24 02:03:31 +0400
commit8ef4c4762be16d9e2f4f3fc274009f294893cd2e (patch)
tree91b39b09726baf52c796db530e707c68a0255a86 /source/blender/collada/collada.cpp
parent870dba7657c7cc169a9d98695134f3ee8de8cd5b (diff)
Added option for exporting material based textures. Cleaned up header files due to a bug in osx
Diffstat (limited to 'source/blender/collada/collada.cpp')
-rw-r--r--source/blender/collada/collada.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp
index 17be0c46cd3..f7e0f75ec5c 100644
--- a/source/blender/collada/collada.cpp
+++ b/source/blender/collada/collada.cpp
@@ -63,6 +63,7 @@ int collada_export(Scene *sce,
int active_uv_only,
int include_uv_textures,
+ int include_material_textures,
int use_texture_copies,
int use_object_instantiation,
@@ -90,8 +91,9 @@ int collada_export(Scene *sce,
export_settings.deform_bones_only = deform_bones_only != 0;
export_settings.active_uv_only = active_uv_only != 0;
- export_settings.include_uv_textures = include_uv_textures;
- export_settings.use_texture_copies = use_texture_copies;
+ export_settings.include_uv_textures = include_uv_textures != 0;
+ export_settings.include_material_textures= include_material_textures != 0;
+ export_settings.use_texture_copies = use_texture_copies != 0;
export_settings.use_object_instantiation = use_object_instantiation != 0;
export_settings.sort_by_name = sort_by_name != 0;