diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-02-28 17:24:52 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-02-28 17:24:52 +0300 |
| commit | 82b21ba1663b253b4bde318599eedd062b5e9f64 (patch) | |
| tree | bbe6dbf3c966834cd223054ad8e86b0099cefbac /source/blender/collada/MaterialExporter.cpp | |
| parent | 9234cb6e30ed36dfcfae794824fcbb88618e060f (diff) | |
Fix [#26213] Collada exporter id's not unique
Reported by Kevin Yoon
<material> could get same id as <node>, prevent that by suffixing -material.
Diffstat (limited to 'source/blender/collada/MaterialExporter.cpp')
| -rw-r--r-- | source/blender/collada/MaterialExporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/collada/MaterialExporter.cpp index 5814cb8101c..0030f2a6285 100644 --- a/source/blender/collada/MaterialExporter.cpp +++ b/source/blender/collada/MaterialExporter.cpp @@ -49,7 +49,7 @@ void MaterialsExporter::operator()(Material *ma, Object *ob) { std::string name(id_name(ma)); - openMaterial(translate_id(name), name); + openMaterial(get_material_id(ma), name); std::string efid = translate_id(name) + "-effect"; addInstanceEffect(COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, efid)); |