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 | |
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')
-rw-r--r-- | source/blender/blenkernel/depsgraph_private.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 1 | ||||
-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 | ||||
-rw-r--r-- | source/blender/compositor/COM_compositor.h | 4 | ||||
-rw-r--r-- | source/gameengine/Expressions/Value.h | 8 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/GPC_Canvas.h | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Network/NG_NetworkScene.h | 2 |
10 files changed, 13 insertions, 18 deletions
diff --git a/source/blender/blenkernel/depsgraph_private.h b/source/blender/blenkernel/depsgraph_private.h index ad5369c0820..14e7d220449 100644 --- a/source/blender/blenkernel/depsgraph_private.h +++ b/source/blender/blenkernel/depsgraph_private.h @@ -137,8 +137,6 @@ DagNode *dag_get_node(DagForest *forest, void *fob); DagNode *dag_get_sub_node(DagForest *forest, void *fob); void dag_add_relation(DagForest *forest, DagNode *fob1, DagNode *fob2, short rel, const char *name); -void graph_bfs(void); - DagNodeQueue *graph_dfs(void); void set_node_xy(DagNode *node, float x, float y); diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index d144ac927a6..f9bd202d64f 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -1338,6 +1338,7 @@ void BKE_rigidbody_remove_constraint(Scene *scene, Object *ob) {} void BKE_rigidbody_sync_transforms(RigidBodyWorld *rbw, Object *ob, float ctime) {} void BKE_rigidbody_aftertrans_update(Object *ob, float loc[3], float rot[3], float quat[4], float rotAxis[3], float rotAngle) {} void BKE_rigidbody_cache_reset(RigidBodyWorld *rbw) {} +void BKE_rigidbody_rebuild_world(Scene *scene, float ctime) {} void BKE_rigidbody_do_simulation(Scene *scene, float ctime) {} #ifdef __GNUC__ 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()); diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h index a64583b68ff..fc546188816 100644 --- a/source/blender/compositor/COM_compositor.h +++ b/source/blender/compositor/COM_compositor.h @@ -20,9 +20,9 @@ * Monique Dewanchand */ - #ifdef __cplusplus +#ifdef __cplusplus extern "C" { - #endif +#endif #include "DNA_color_types.h" #include "DNA_node_types.h" diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h index c4af3255f4a..580691d88c4 100644 --- a/source/gameengine/Expressions/Value.h +++ b/source/gameengine/Expressions/Value.h @@ -253,9 +253,9 @@ public: // Increase global reference count, used to see at the end of the program // if all CValue-derived classes have been dereferenced to 0 //debug(gRefCountValue++); - #ifdef _DEBUG +#ifdef _DEBUG //gRefCountValue++; - #endif +#endif m_refcount++; return this; } @@ -266,9 +266,9 @@ public: // Decrease global reference count, used to see at the end of the program // if all CValue-derived classes have been dereferenced to 0 //debug(gRefCountValue--); - #ifdef _DEBUG +#ifdef _DEBUG //gRefCountValue--; - #endif +#endif // Decrease local reference count, if it reaches 0 the object should be freed if (--m_refcount > 0) { diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h index 00c5911a8b4..07f96166ec2 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.h +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h @@ -36,8 +36,8 @@ #include "RAS_Rect.h" #ifdef WIN32 - #pragma warning (disable:4786) // suppress stl-MSVC debug info warning - #include <windows.h> +# pragma warning (disable:4786) // suppress stl-MSVC debug info warning +# include <windows.h> #endif /* WIN32 */ #include "GL/glew.h" diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index 4a5a1704979..ece6abc9447 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -68,8 +68,8 @@ extern "C"{ #include "KX_BulletPhysicsController.h" #include "btBulletDynamicsCommon.h" - #ifdef WIN32 -#if _MSC_VER >= 1310 +#ifdef WIN32 +#if defined(_MSC_VER) && (_MSC_VER >= 1310) //only use SIMD Hull code under Win32 //#define TEST_HULL 1 #ifdef TEST_HULL diff --git a/source/gameengine/Network/NG_NetworkScene.h b/source/gameengine/Network/NG_NetworkScene.h index 10dad210128..e6233852ee2 100644 --- a/source/gameengine/Network/NG_NetworkScene.h +++ b/source/gameengine/Network/NG_NetworkScene.h @@ -42,7 +42,7 @@ //MSVC defines SendMessage as a win api function, even though we aren't using it #ifdef SendMessage - #undef SendMessage +# undef SendMessage #endif using namespace std; |