code cleanup: unused vars in collada, preprocessor formatting & warning in mingw.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Mar 2013 00:53:57 +0000 (00:53 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Mar 2013 00:53:57 +0000 (00:53 +0000)
also compiling without bullet needed a stub added.

source/blender/blenkernel/depsgraph_private.h
source/blender/blenkernel/intern/rigidbody.c
source/blender/collada/ControllerExporter.cpp
source/blender/collada/GeometryExporter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/compositor/COM_compositor.h
source/gameengine/Expressions/Value.h
source/gameengine/GamePlayer/common/GPC_Canvas.h
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
source/gameengine/Network/NG_NetworkScene.h

index ad5369c08207d9d56804de568c73751f3342f819..14e7d2204497b93525b17ad5edc31f371bc0cb25 100644 (file)
@@ -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);
index d144ac927a684da7c7f5dc3999747b99679ad057..f9bd202d64f6232a891145560f02cfe6113e7092 100644 (file)
@@ -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__
index 6b367b9cea9091751967b7534683ed00410095c3..35fcc926beab2309720c9556b06c160681aa4b17 100644 (file)
@@ -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");
        }
 }
index 7cdda87766e49a607ac19d7dfec822e53f37e450..87063891a5f76880b5f3e7e2e4dbfeff6c1cb466 100644 (file)
@@ -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;
index 69944563b6aacd68f60e0e9c719a0bd8becd7d02..1eb1460a9e2200a43cf04985d0149cc2e3d79748 100644 (file)
@@ -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());
index a64583b68ffa5c8b51d8f617192c1035efbc3d00..fc5461888166b2e094cf5fb32f9d685fbd444bb7 100644 (file)
@@ -20,9 +20,9 @@
  *             Monique Dewanchand
  */
 
- #ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
- #endif
+#endif
 
 #include "DNA_color_types.h"
 #include "DNA_node_types.h"
index c4af3255f4a9e49427190180ef735301f419392f..580691d88c4720cebc92101c4045098957886cdc 100644 (file)
@@ -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)
                {
index 00c5911a8b403ec25b05d2193e6cdb70d17097b6..07f96166ec2dea0508f1a10353c5b55a19e805b4 100644 (file)
@@ -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"
index 4a5a1704979668f10d293f49d881d56de585cc01..ece6abc944719b4f91fa9d57c775dc9496583066 100644 (file)
@@ -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
index 10dad210128ccf5b777e65a16064709f4fae63ab..e6233852ee252fd6dfd27fb8d5bf88bd7edf0e1a 100644 (file)
@@ -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;