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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-28 01:26:06 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-28 01:26:06 +0400
commit390ddd910309ad8274b43439aaaacf7ebbf6b52a (patch)
tree2b13e8512717cb5fb39a18193f82bb6312c0cc3f /source/blender/collada/MaterialExporter.cpp
parenta31cc2aeb7748bbbb51f02490a047633f9b10087 (diff)
Fix #33168: collada export added incorrect -material postfix to material names.
In the bug report it was also mentioned that special characters should be preserved for names, however the collada 1.4 specification does not allow this. Version 1.5 does, but we are still writing 1.4 files and files with such special characters will then fail to open in some applications.
Diffstat (limited to 'source/blender/collada/MaterialExporter.cpp')
-rw-r--r--source/blender/collada/MaterialExporter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/collada/MaterialExporter.cpp
index 5a1d8b7602a..4aece997f72 100644
--- a/source/blender/collada/MaterialExporter.cpp
+++ b/source/blender/collada/MaterialExporter.cpp
@@ -70,7 +70,7 @@ void MaterialsExporter::operator()(Material *ma, Object *ob)
{
std::string name(id_name(ma));
- openMaterial(get_material_id(ma), get_material_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));