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)

release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py

@@ -10,7 +10,7 @@ op.include_armatures = True
 op.include_shapekeys = False
 op.deform_bones_only = True
 op.active_uv_only = True
-op.include_uv_textures = True
+op.export_texture_type_selection = 'uv'
 op.use_texture_copies = True
 op.triangulate = True
 op.use_object_instantiation = False

release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py

@@ -10,7 +10,7 @@ op.include_armatures = False
 op.include_shapekeys = False
 op.deform_bones_only = False
 op.active_uv_only = True
-op.include_uv_textures = True
+op.export_texture_type_selection = 'uv'
 op.use_texture_copies = True
 op.triangulate = True
 op.use_object_instantiation = False

source/blender/collada/ArmatureExporter.cpp

@@ -116,7 +116,10 @@ bool ArmatureExporter::add_instance_controller(Object *ob)
 		write_bone_URLs(ins, ob_arm, bone);
 	}
 
-	InstanceWriter::add_material_bindings(ins.getBindMaterial(), ob, this->export_settings->active_uv_only);
+	InstanceWriter::add_material_bindings(ins.getBindMaterial(), 
+		ob, 
+		this->export_settings->active_uv_only,
+		this->export_settings->export_texture_type);
 		
 	ins.add();
 	return true;

source/blender/collada/ControllerExporter.cpp

@@ -98,7 +98,10 @@ bool ControllerExporter::add_instance_controller(Object *ob)
 		write_bone_URLs(ins, ob_arm, bone);
 	}
 
-	InstanceWriter::add_material_bindings(ins.getBindMaterial(), ob, this->export_settings->active_uv_only);
+	InstanceWriter::add_material_bindings(ins.getBindMaterial(),
+		    ob, 
+			this->export_settings->active_uv_only,
+			this->export_settings->export_texture_type);
 		
 	ins.add();
 	return true;

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);

source/blender/collada/ExportSettings.h

@@ -27,7 +27,6 @@
 #ifndef __EXPORTSETTINGS_H__
 #define __EXPORTSETTINGS_H__
 
-#include "collada.h"
 #include "collada.h"
 
 struct ExportSettings {
@@ -42,8 +41,7 @@ public:
 	bool deform_bones_only;
 
 	bool active_uv_only;
-	bool include_uv_textures;
+	BC_export_texture_type export_texture_type;
-	bool include_material_textures;
 	bool use_texture_copies;
 
 	bool triangulate;

source/blender/collada/ImageExporter.cpp

@@ -232,11 +232,10 @@ void ImagesExporter::exportImages(Scene *sce)
 	openLibrary();
 
 	MaterialFunctor mf;
-	if (this->export_settings->include_material_textures) {
+	if (this->export_settings->export_texture_type == BC_TEXTURE_TYPE_MAT) {
 		mf.forEachMaterialInExportSet<ImagesExporter>(sce, *this, this->export_settings->export_set);
 	}
-
+	else if (this->export_settings->export_texture_type == BC_TEXTURE_TYPE_UV) {
-	if (this->export_settings->include_uv_textures) {
 		export_UV_Images();
 	}
 

source/blender/collada/InstanceWriter.cpp

@@ -41,7 +41,7 @@ extern "C" {
 #include "collada_internal.h"
 #include "collada_utils.h"
 
-void InstanceWriter::add_material_bindings(COLLADASW::BindMaterial& bind_material, Object *ob, bool active_uv_only)
+void InstanceWriter::add_material_bindings(COLLADASW::BindMaterial& bind_material, Object *ob, bool active_uv_only, BC_export_texture_type export_texture_type)
 {
 	for (int a = 0; a < ob->totcol; a++) {
 		Material *ma = give_current_material(ob, a + 1);

source/blender/collada/MaterialExporter.cpp

@@ -37,6 +37,8 @@ MaterialsExporter::MaterialsExporter(COLLADASW::StreamWriter *sw, const ExportSe
 }
 
 void MaterialsExporter::exportMaterials(Scene *sce)
+{
+	if (this->export_settings->export_texture_type == BC_TEXTURE_TYPE_MAT)
 	{
 		if (hasMaterials(sce)) {
 			openLibrary();
@@ -47,6 +49,31 @@ void MaterialsExporter::exportMaterials(Scene *sce)
 			closeLibrary();
 		}
 	}
+#if 0
+	// Temporary discarded (to keep consistent commits)
+	else if (this->export_settings->export_texture_type == BC_TEXTURE_TYPE_UV)
+	{
+		std::set<Image *> uv_images = bc_getUVImages(sce, !this->export_settings->active_uv_only);
+		if (uv_images.size() > 0) {
+			openLibrary();
+			std::set<Image *>::iterator uv_images_iter;
+			for (uv_images_iter = uv_images.begin();
+				uv_images_iter != uv_images.end();
+				uv_images_iter++) {
+
+				Image *ima = *uv_images_iter;
+				std::string matid(id_name(ima));
+
+				openMaterial(get_material_id_from_id(matid), translate_id(matid));
+				std::string efid = translate_id(matid) + "-effect";
+				addInstanceEffect(COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, efid));
+				closeMaterial();
+			}
+			closeLibrary();
+		}
+	}
+#endif
+}
 
 bool MaterialsExporter::hasMaterials(Scene *sce)
 {

source/blender/collada/SceneExporter.cpp

@@ -151,7 +151,10 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce)
 			COLLADASW::InstanceGeometry instGeom(mSW);
 			instGeom.setUrl(COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, get_geometry_id(ob, this->export_settings->use_object_instantiation)));
 			instGeom.setName(translate_id(id_name(ob)));
-			InstanceWriter::add_material_bindings(instGeom.getBindMaterial(), ob, this->export_settings->active_uv_only);
+			InstanceWriter::add_material_bindings(instGeom.getBindMaterial(), 
+				    ob, 
+					this->export_settings->active_uv_only, 
+					this->export_settings->export_texture_type);
 
 			instGeom.add();
 		}

source/blender/collada/collada.cpp

@@ -80,8 +80,7 @@ int collada_export(Scene *sce,
                    int deform_bones_only,
 
 				   int active_uv_only,
-				   int include_uv_textures,
+				   BC_export_texture_type export_texture_type,
-				   int include_material_textures,
 				   int use_texture_copies,
 
                    int triangulate,
@@ -106,8 +105,7 @@ 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 != 0;
+	export_settings.export_texture_type      = export_texture_type;
-	export_settings.include_material_textures= include_material_textures != 0;
 	export_settings.use_texture_copies       = use_texture_copies != 0;
 
 	export_settings.triangulate                = triangulate != 0;

source/blender/collada/collada.h

@@ -46,6 +46,12 @@ typedef enum BC_export_transformation_type {
 	BC_TRANSFORMATION_TYPE_TRANSROTLOC
 } BC_export_transformation_type;
 
+typedef enum BC_export_texture_type {
+	BC_TEXTURE_TYPE_NONE,
+	BC_TEXTURE_TYPE_UV,
+	BC_TEXTURE_TYPE_MAT
+} BC_export_texture_type;
+
 struct bContext;
 struct Scene;
 
@@ -74,8 +80,7 @@ int collada_export(struct Scene *sce,
                    int deform_bones_only,
 
                    int active_uv_only,
-                   int include_uv_textures,
+                   BC_export_texture_type export_texture_type,
-                   int include_material_textures,
                    int use_texture_copies,
 
                    int triangulate,

source/blender/editors/io/io_collada.c

@@ -87,8 +87,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
 	int include_shapekeys;
 	int deform_bones_only;
 
-	int include_uv_textures;
+	int export_texture_type;
-	int include_material_textures;
 	int use_texture_copies;
 	int active_uv_only;
 
@@ -139,8 +138,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
 	include_shapekeys        = RNA_boolean_get(op->ptr, "include_shapekeys");
 	deform_bones_only        = RNA_boolean_get(op->ptr, "deform_bones_only");
 
-	include_uv_textures      = RNA_boolean_get(op->ptr, "include_uv_textures");
+	export_texture_type      = RNA_enum_get(op->ptr, "export_texture_type_selection");
-	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");
 
@@ -169,8 +167,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
 		deform_bones_only,
 
 		active_uv_only,
-		include_uv_textures,
+		export_texture_type,
-		include_material_textures,
 		use_texture_copies,
 
 		triangulate,
@@ -241,10 +238,7 @@ static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr)
 	uiItemR(row, imfptr, "active_uv_only", 0, NULL, ICON_NONE);
 
 	row = uiLayoutRow(box, false);
-	uiItemR(row, imfptr, "include_uv_textures", 0, NULL, ICON_NONE);
+	uiItemR(row, imfptr, "export_texture_type_selection", 0, "", ICON_NONE);
-
-	row = uiLayoutRow(box, false);
-	uiItemR(row, imfptr, "include_material_textures", 0, NULL, ICON_NONE);
 
 	row = uiLayoutRow(box, false);
 	uiItemR(row, imfptr, "use_texture_copies", 1, NULL, ICON_NONE);
@@ -326,6 +320,13 @@ void WM_OT_collada_export(wmOperatorType *ot)
 		{ 0, NULL, 0, NULL, NULL }
 	};
 
+	static EnumPropertyItem prop_bc_export_texture_type[] = {
+		{ BC_TEXTURE_TYPE_NONE, "none", 0, "No Textures", "Do not export any image based Textures" },
+		{ BC_TEXTURE_TYPE_UV, "uv", 0, "UV Textures", "Export UV Textures (Face textures)" },
+		{ BC_TEXTURE_TYPE_MAT, "mat", 0, "Material Textures", "Export Material Textures" },
+		{ 0, NULL, 0, NULL, NULL }
+	};
+
 	ot->name = "Export COLLADA";
 	ot->description = "Save a Collada file";
 	ot->idname = "WM_OT_collada_export";
@@ -368,16 +369,9 @@ void WM_OT_collada_export(wmOperatorType *ot)
 	RNA_def_boolean(func, "deform_bones_only", 0, "Deform Bones only",
 	                "Only export deforming bones with armatures");
 
-
 	RNA_def_boolean(func, "active_uv_only", 0, "Only Selected UV Map",
 	                "Export only the selected UV Map");
 
-	RNA_def_boolean(func, "include_uv_textures", 0, "Include UV Textures",
-	                "Export textures assigned to the object UV Maps");
-
-	RNA_def_boolean(func, "include_material_textures", 0, "Include Material Textures",
-	                "Export textures assigned to the object Materials");
-
 	RNA_def_boolean(func, "use_texture_copies", 1, "Copy",
 	                "Copy textures to same folder where the .dae file is exported");
 
@@ -394,12 +388,21 @@ void WM_OT_collada_export(wmOperatorType *ot)
 	RNA_def_boolean(func, "sort_by_name", 0, "Sort by Object name",
 	                "Sort exported data by Object name");
 
+
 	RNA_def_int(func, "export_transformation_type", 0, INT_MIN, INT_MAX,
 		"Transform", "Transformation type for translation, scale and rotation", INT_MIN, INT_MAX);
 
 	RNA_def_enum(func, "export_transformation_type_selection", prop_bc_export_transformation_type, 0,
 		"Transform", "Transformation type for translation, scale and rotation");
 
+
+	RNA_def_int(func, "export_texture_type", 0, INT_MIN, INT_MAX,
+		"Texture Type", "Type for exported Textures (UV or MAT)", INT_MIN, INT_MAX);
+
+	RNA_def_enum(func, "export_texture_type_selection", prop_bc_export_texture_type, 0,
+		"Texture Type", "Type for exported Textures (UV or MAT)");
+
+
 	RNA_def_boolean(func, "open_sim", 0, "Export to SL/OpenSim",
 	                "Compatibility mode for SL, OpenSim and other compatible online worlds");
 

source/blender/makesrna/intern/rna_scene_api.c

@@ -280,8 +280,7 @@ static void rna_Scene_collada_export(
         int include_shapekeys,
         int deform_bones_only,
         int active_uv_only,
-        int include_uv_textures,
+		int export_texture_type,
-        int include_material_textures,
         int use_texture_copies,
         int triangulate,
         int use_object_instantiation,
@@ -305,8 +304,7 @@ static void rna_Scene_collada_export(
 		deform_bones_only,
 
 		active_uv_only,
-		include_uv_textures,
+		export_texture_type,
-		include_material_textures,
 		use_texture_copies,
 
 		triangulate,
@@ -403,11 +401,8 @@ void RNA_api_scene(StructRNA *srna)
 
 	RNA_def_boolean(func, "active_uv_only", false, "Only Selected UV Map", "Export only the selected UV Map");
 
-	RNA_def_boolean(func, "include_uv_textures", false,
+	RNA_def_int(func, "export_texture_type", 0, INT_MIN, INT_MAX,
-	                "Include UV Textures", "Export textures assigned to the object UV Maps");
+		"Texture Type", "Type for exported Textures (UV or MAT)", INT_MIN, INT_MAX);
-
-	RNA_def_boolean(func, "include_material_textures", false,
-	                "Include Material Textures", "Export textures assigned to the object Materials");
 
 	RNA_def_boolean(func, "use_texture_copies", true,
 	                "Copy", "Copy textures to same folder where the .dae file is exported");