[Bf-blender-cvs] [14d4c5477df] collada2.8: fix: collada: preserve original material names in export

[Gaia Clary]

Commit: 14d4c5477dff6c0e6eeba13e0b9f3ce37dccfecf
Author: Gaia Clary
Date:   Wed Nov 14 19:47:09 2018 +0100
Branches: collada2.8
https://developer.blender.org/rB14d4c5477dff6c0e6eeba13e0b9f3ce37dccfecf

fix: collada: preserve original material names in export

===================================================================

M	source/blender/collada/MaterialExporter.cpp

===================================================================

diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/collada/MaterialExporter.cpp
index 4aece997f72..2fa71817ac8 100644
--- a/source/blender/collada/MaterialExporter.cpp
+++ b/source/blender/collada/MaterialExporter.cpp
@@ -68,12 +68,12 @@ bool MaterialsExporter::hasMaterials(Scene *sce)
 
 void MaterialsExporter::operator()(Material *ma, Object *ob)
 {
-	std::string name(id_name(ma));
+	std::string mat_name = encode_xml(id_name(ma));
+	std::string mat_id = get_material_id(ma);
+	std::string eff_id = get_effect_id(ma);
 
-	openMaterial(get_material_id(ma), translate_id(name));
-
-	std::string efid = translate_id(name) + "-effect";
-	addInstanceEffect(COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, efid));
+	openMaterial(mat_id, mat_name);
+	addInstanceEffect(COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, eff_id));
 
 	closeMaterial();
 }