Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-03-03 07:40:34 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-03-03 07:40:34 +0300
commit23330473e37dbcc973a20942ed9af4a716e6c57f (patch)
tree7f4a8b2e2f45ee3d9279b93c1489e0542e52cb77 /source/blender/collada
parent26a251202bc8fc006b6608c0fdacc0cccd95b615 (diff)
Cleanup: remove unused collada conversion
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/DocumentImporter.cpp3
-rw-r--r--source/blender/collada/MeshImporter.cpp16
-rw-r--r--source/blender/collada/MeshImporter.h2
3 files changed, 0 insertions, 21 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 20ef45b6b71..462b7b6f200 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 a993f775782..d743a2925a0 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 9fc1d777f62..9d5fefb83f2 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);