1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup: remove unused collada conversion

Browse Source
This commit is contained in:
Campbell Barton 2015-03-03 15:40:34 +11:00
parent 26a251202b
commit 23330473e3
3 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/collada/DocumentImporter.cpp
View File

@ -157,9 +157,6 @@ bool DocumentImporter::import()
delete ehandler; delete ehandler;
//XXX No longer needed (geometries are now created as bmesh)
//mesh_importer.bmeshConversion();
return true; return true;
} }

16
source/blender/collada/MeshImporter.cpp
View File

@ -808,22 +808,6 @@ bool MeshImporter::is_flat_face(unsigned int *nind, COLLADAFW::MeshVertexData& n
return true; 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) Object *MeshImporter::get_object_by_geom_uid(const COLLADAFW::UniqueId& geom_uid)
{ {
if (uid_object_map.find(geom_uid) != uid_object_map.end()) if (uid_object_map.find(geom_uid) != uid_object_map.end())

2
source/blender/collada/MeshImporter.h
View File

@ -161,8 +161,6 @@ public:
MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Scene *sce); MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Scene *sce);
void bmeshConversion();
virtual Object *get_object_by_geom_uid(const COLLADAFW::UniqueId& geom_uid); virtual Object *get_object_by_geom_uid(const COLLADAFW::UniqueId& geom_uid);
virtual Mesh *get_mesh_by_geom_uid(const COLLADAFW::UniqueId& geom_uid); virtual Mesh *get_mesh_by_geom_uid(const COLLADAFW::UniqueId& geom_uid);