From d644069860674dd576bae275bf914b385b38053b Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Wed, 9 May 2012 08:14:49 +0000 Subject: Apply [#31335] COLLADA: fix for odd names for materials in exported dae files Patch by Gaia Clary This patch removes the index numbering from materials, which is not necessary. --- source/blender/collada/GeometryExporter.cpp | 2 +- source/blender/collada/InstanceWriter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index 05d4080dcb6..ba41e603a29 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -209,7 +209,7 @@ void GeometryExporter::createPolylist(short material_index, // sets material name if (ma) { std::ostringstream ostr; - ostr << translate_id(id_name(ma)) << material_index+1; + ostr << translate_id(id_name(ma)); polylist.setMaterial(ostr.str()); } diff --git a/source/blender/collada/InstanceWriter.cpp b/source/blender/collada/InstanceWriter.cpp index a605bdeefcc..f83289ff5f5 100644 --- a/source/blender/collada/InstanceWriter.cpp +++ b/source/blender/collada/InstanceWriter.cpp @@ -52,7 +52,7 @@ void InstanceWriter::add_material_bindings(COLLADASW::BindMaterial& bind_materia std::string matid(get_material_id(ma)); matid = translate_id(matid); std::ostringstream ostr; - ostr << translate_id(id_name(ma)) << a+1; + ostr << translate_id(id_name(ma)); COLLADASW::InstanceMaterial im(ostr.str(), COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, matid)); // create for each uv map -- cgit v1.2.3