diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-10 01:17:14 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-10 01:17:14 +0400 |
| commit | f72eef5de7fd109e9d71021adc0990b040b750b2 (patch) | |
| tree | 25cbfd24782559266af455985f101d23d8295694 /source/blender/collada/MeshImporter.cpp | |
| parent | 6b8ca3ccdf7643002237fc59ef42ee1046ce2a70 (diff) | |
COLLADA
Import unit_settings to scene.
Note: I use here RNA to do this, and I think I might slowly work on replacing low-level DNA usage with RNA where possible.
Diffstat (limited to 'source/blender/collada/MeshImporter.cpp')
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index df5136f1cb4..44ac310e353 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -323,8 +323,9 @@ void MeshImporter::read_vertices(COLLADAFW::Mesh *mesh, Mesh *me) MVert *mvert; int i; - for (i = 0, mvert = me->mvert; i < me->totvert; i++, mvert++) + for (i = 0, mvert = me->mvert; i < me->totvert; i++, mvert++) { get_vector(mvert->co, pos, i); + } } int MeshImporter::triangulate_poly(unsigned int *indices, int totvert, MVert *verts, std::vector<unsigned int>& tri) @@ -631,7 +632,7 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) } } - mat_prim_map[mp->getMaterialId()].push_back(prim); + mat_prim_map[mp->getMaterialId()].push_back(prim); } geom_uid_mat_mapping_map[mesh->getUniqueId()] = mat_prim_map; @@ -689,7 +690,7 @@ bool MeshImporter::flat_face(unsigned int *nind, COLLADAFW::MeshVertexData& nor, return true; } -MeshImporter::MeshImporter(ArmatureImporter *arm, Scene *sce) : scene(sce), armature_importer(arm) {} +MeshImporter::MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Scene *sce) : unitconverter(unitconv), scene(sce), armature_importer(arm) {} Object *MeshImporter::get_object_by_geom_uid(const COLLADAFW::UniqueId& geom_uid) { |