[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46449] trunk/blender/source/blender/ collada: Apply [#31335] COLLADA: fix for odd names for materials in exported dae files

[Nathan Letwory]

Revision: 46449
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46449
Author:   jesterking
Date:     2012-05-09 08:14:49 +0000 (Wed, 09 May 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/GeometryExporter.cpp
    trunk/blender/source/blender/collada/InstanceWriter.cpp

Modified: trunk/blender/source/blender/collada/GeometryExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/GeometryExporter.cpp	2012-05-09 08:09:03 UTC (rev 46448)
+++ trunk/blender/source/blender/collada/GeometryExporter.cpp	2012-05-09 08:14:49 UTC (rev 46449)
@@ -209,7 +209,7 @@
 	// 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());
 	}
 			

Modified: trunk/blender/source/blender/collada/InstanceWriter.cpp
===================================================================
--- trunk/blender/source/blender/collada/InstanceWriter.cpp	2012-05-09 08:09:03 UTC (rev 46448)
+++ trunk/blender/source/blender/collada/InstanceWriter.cpp	2012-05-09 08:14:49 UTC (rev 46449)
@@ -52,7 +52,7 @@
 			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 <bind_vertex_input> for each uv map