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/editors/io | |
| 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/editors/io')
| -rw-r--r-- | source/blender/editors/io/io_collada.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 0ceffe19ad8..dca38e53934 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -85,6 +85,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) int deform_bones_only; int include_uv_textures; + int include_material_textures; int use_texture_copies; int active_uv_only; @@ -109,6 +110,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) deform_bones_only = RNA_boolean_get(op->ptr, "deform_bones_only"); include_uv_textures = RNA_boolean_get(op->ptr, "include_uv_textures"); + include_material_textures= RNA_boolean_get(op->ptr, "include_material_textures"); use_texture_copies = RNA_boolean_get(op->ptr, "use_texture_copies"); active_uv_only = RNA_boolean_get(op->ptr, "active_uv_only"); @@ -129,8 +131,9 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) include_armatures, deform_bones_only, - include_uv_textures, active_uv_only, + include_uv_textures, + include_material_textures, use_texture_copies, use_object_instantiation, @@ -183,6 +186,9 @@ void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr) uiItemR(row, imfptr, "include_uv_textures", 0, NULL, ICON_NONE); row = uiLayoutRow(box, 0); + uiItemR(row, imfptr, "include_material_textures", 0, NULL, ICON_NONE); + + row = uiLayoutRow(box, 0); uiItemR(row, imfptr, "use_texture_copies", 1, NULL, ICON_NONE); @@ -267,6 +273,9 @@ void WM_OT_collada_export(wmOperatorType *ot) RNA_def_boolean(ot->srna, "include_uv_textures", 0, "Include UV Textures", "Export textures assigned to the object UV maps"); + RNA_def_boolean(ot->srna, "include_material_textures", 0, "Include Material Textures", + "Export textures assigned to the object Materials"); + RNA_def_boolean(ot->srna, "use_texture_copies", 1, "copy", "Copy textures to same folder where the .dae file is exported"); |