[Bf-blender-cvs] [2333047] master: Cleanup: remove unused collada conversion

[Campbell Barton]

Commit: 23330473e37dbcc973a20942ed9af4a716e6c57f
Author: Campbell Barton
Date:   Tue Mar 3 15:40:34 2015 +1100
Branches: master
https://developer.blender.org/rB23330473e37dbcc973a20942ed9af4a716e6c57f

Cleanup: remove unused collada conversion

===================================================================

M	source/blender/collada/DocumentImporter.cpp
M	source/blender/collada/MeshImporter.cpp
M	source/blender/collada/MeshImporter.h

===================================================================

diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 20ef45b..462b7b6 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -157,9 +157,6 @@ bool DocumentImporter::import()
 	
 	delete ehandler;
 
-	//XXX No longer needed (geometries are now created as bmesh)
-	//mesh_importer.bmeshConversion();
-
 	return true;
 }
 
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index a993f77..d743a29 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -808,22 +808,6 @@ bool MeshImporter::is_flat_face(unsigned int *nind, COLLADAFW::MeshVertexData& n
 	return true;
 }
 
-
-void MeshImporter::bmeshConversion()
-{
-	for (std::map<COLLADAFW::UniqueId, Mesh *>::iterator m = uid_mesh_map.begin();
-	     m != uid_mesh_map.end(); ++m)
-	{
-		if ((*m).second) {
-			Mesh *me = (*m).second;
-			BKE_mesh_tessface_clear(me);
-			BKE_mesh_calc_normals(me);
-			/* BKE_mesh_validate(me, true, true); */
-		}
-	}
-}
-
-
 Object *MeshImporter::get_object_by_geom_uid(const COLLADAFW::UniqueId& geom_uid)
 {
 	if (uid_object_map.find(geom_uid) != uid_object_map.end())
diff --git a/source/blender/collada/MeshImporter.h b/source/blender/collada/MeshImporter.h
index 9fc1d77..9d5fefb 100644
--- a/source/blender/collada/MeshImporter.h
+++ b/source/blender/collada/MeshImporter.h
@@ -161,8 +161,6 @@ public:
 
 	MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Scene *sce);
 
-	void bmeshConversion();
-
 	virtual Object *get_object_by_geom_uid(const COLLADAFW::UniqueId& geom_uid);
 
 	virtual Mesh *get_mesh_by_geom_uid(const COLLADAFW::UniqueId& geom_uid);