diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-04 04:53:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-04 04:53:57 +0400 |
| commit | 2921d48239da85b995c77980cc5bf91ea4a69c3e (patch) | |
| tree | bee3aef1fbcb90f94be0bda778a23cdc3f9c9ea8 /source/blender/collada | |
| parent | 78351264195aeb2823470647526feaf404d16848 (diff) | |
code cleanup: unused vars in collada, preprocessor formatting & warning in mingw.
also compiling without bullet needed a stub added.
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/ControllerExporter.cpp | 2 | ||||
| -rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 3 | ||||
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index 6b367b9cea9..35fcc926bea 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -404,7 +404,7 @@ void ControllerExporter::add_weight_extras(Key *key) kb = kb->next; for (; kb; kb = kb->next) { // XXX why is the weight not used here and set to 0.0? - float weight = kb->curval; + // float weight = kb->curval; extra.addExtraTechniqueParameter ("KHR", "morph_weights" , 0.000, "MORPH_WEIGHT_TO_TARGET"); } } diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index 7cdda87766e..87063891a5f 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -76,7 +76,6 @@ void GeometryExporter::operator()(Object *ob) #endif bool use_instantiation = this->export_settings->use_object_instantiation; - bool triangulate = this->export_settings->triangulate; Mesh *me = bc_get_mesh_copy( mScene, ob, this->export_settings->export_mesh_type, @@ -379,8 +378,6 @@ void GeometryExporter::createPolylist(short material_index, // <p> int texindex = 0; - unsigned int vi = 0; - unsigned int ni = 0; for (i = 0; i < totpolys; i++) { MPoly *p = &mpolys[i]; int loop_count = p->totloop; diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 69944563b6a..1eb1460a9e2 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -384,7 +384,6 @@ void MeshImporter::allocate_poly_data(COLLADAFW::Mesh *collada_mesh, Mesh *me) for (int i = 0; i < totuvset; i++) { COLLADAFW::MeshVertexData::InputInfos *info = collada_mesh->getUVCoords().getInputInfosArray()[i]; COLLADAFW::String &uvname = info->mName; - int x = 0; // Allocate space for UV_data CustomData_add_layer_named(&me->pdata, CD_MTEXPOLY, CD_DEFAULT, NULL, me->totpoly, uvname.c_str()); CustomData_add_layer_named(&me->ldata, CD_MLOOPUV, CD_DEFAULT, NULL, me->totloop, uvname.c_str()); |