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/InstanceWriter.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/InstanceWriter.cpp')
| -rw-r--r-- | source/blender/collada/InstanceWriter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/InstanceWriter.cpp b/source/blender/collada/InstanceWriter.cpp index c9bcd24f9a7..f822db0f39b 100644 --- a/source/blender/collada/InstanceWriter.cpp +++ b/source/blender/collada/InstanceWriter.cpp @@ -50,7 +50,7 @@ void InstanceWriter::add_material_bindings(COLLADASW::BindMaterial& bind_materia COLLADASW::InstanceMaterialList& iml = bind_material.getInstanceMaterialList(); if (ma) { - std::string matid(id_name(ma)); + std::string matid(get_material_id(ma)); matid = translate_id(matid); COLLADASW::InstanceMaterial im(matid, COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, matid)); |