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/makesrna/intern/rna_scene_api.c | |
| 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/makesrna/intern/rna_scene_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene_api.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index 7fec46b4837..13b60498900 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -98,7 +98,8 @@ static void rna_Scene_collada_export( int deform_bones_only, int active_uv_only, - int include_textures, + int include_uv_textures, + int include_material_textures, int use_texture_copies, int use_object_instantiation, @@ -107,8 +108,8 @@ static void rna_Scene_collada_export( { collada_export(scene, filepath, apply_modifiers, export_mesh_type, selected, include_children, include_armatures, deform_bones_only, - active_uv_only, include_textures, use_texture_copies, - use_object_instantiation, sort_by_name, second_life); + active_uv_only, include_uv_textures, include_material_textures, + use_texture_copies, use_object_instantiation, sort_by_name, second_life); } #endif @@ -145,7 +146,8 @@ void RNA_api_scene(StructRNA *srna) parm = RNA_def_boolean(func, "deform_bones_only", 0, "Deform Bones only", "Only export deforming bones with armatures"); parm = RNA_def_boolean(func, "active_uv_only", 0, "Active UV Layer only", "Export only the active UV Layer"); - parm = RNA_def_boolean(func, "include_textures", 0, "Include Textures", "Export related textures"); + parm = RNA_def_boolean(func, "include_uv_textures", 0, "Include UV Textures", "Export textures assigned to the object UV maps"); + parm = RNA_def_boolean(func, "include_material_textures", 0, "Include Material Textures", "Export textures assigned to the object Materials"); parm = RNA_def_boolean(func, "use_texture_copies", 0, "copy", "Copy textures to same folder where the .dae file is exported"); parm = RNA_def_boolean(func, "use_object_instantiation", 1, "Use Object Instances", "Instantiate multiple Objects from same Data"); |