A little more cleanup, removed a bunch of unused vars in the code.

Trying to get rid of some of the extra warnings we can ignore ;)

Kent

diff --git a/intern/bsp/intern/BSP_CSGMesh.cpp b/intern/bsp/intern/BSP_CSGMesh.cpp
index a1da3d544ab7400c86b8d605a7791ec51e8a73a9..ea0d4f0164a22925202df23c9df191187dcae6ed 100755 (executable)
--- a/intern/bsp/intern/BSP_CSGMesh.cpp
+++ b/intern/bsp/intern/BSP_CSGMesh.cpp
@@ -156,8 +156,6 @@ AddPolygon(
 
        if (verts == NULL || num_verts <3) return;
 
-       const int vertex_num = m_verts->size();
-
        // make a polyscone from these vertex indices.
 
        const BSP_FaceInd fi = m_faces->size();
@@ -203,7 +201,6 @@ AddSubTriangle(
 ){
        // This creates a new polygon on the end of the face list.
 
-       const BSP_FaceInd fi = m_faces->size();
        m_faces->push_back(BSP_MFace());                        
        BSP_MFace & face = m_faces->back();
 

diff --git a/intern/bsp/intern/BSP_FragTree.cpp b/intern/bsp/intern/BSP_FragTree.cpp
index 21a3e286447cf72154c435e590d9f75aab6c8e4c..91a901bf879571924043b0d1c4992b54800ee528 100755 (executable)
--- a/intern/bsp/intern/BSP_FragTree.cpp
+++ b/intern/bsp/intern/BSP_FragTree.cpp
@@ -177,7 +177,6 @@ Build(
                
                // choose a plane for the node. The first index in this
                // mesh fragment will do for now.
-               vector<BSP_MVertex> & verts = m_mesh->VertexSet();
 
                // choose a random splitting plane
 
@@ -233,7 +232,6 @@ Push(
                        // fragment onto the output
                        vector<BSP_FaceInd>::const_iterator in_frag_it = in_frag->FaceSet().begin();
                        vector<BSP_FaceInd>::const_iterator in_frag_end = in_frag->FaceSet().end();
-                       vector<BSP_MFace>::iterator faces = in_frag->Mesh()->FaceSet().begin();
                
                        if (keep == current || current == e_classified_on) {
                                for (;in_frag_it != in_frag_end; ++ in_frag_it) {

diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 7ac204708787676a2cd8d18197c0f7cf14abf28a..d4c535004b6d1a588e877e6bd5b26004b55f1399 100644 (file)
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -526,7 +526,6 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype,
 {
        float   M_oldmat[4][4];
        float   M_identity[4][4];
-       float   enforce = 1.0;
        
        if (!constraint || !ob)
                return;

diff --git a/source/blender/deflate/intern/BLO_deflate.c b/source/blender/deflate/intern/BLO_deflate.c
index 372a4d40163edd8eeca0c1090fb252ff254787ab..385b53e8e7ae41c050bcc0e42b4c94eb0bf17f62 100644 (file)
--- a/source/blender/deflate/intern/BLO_deflate.c
+++ b/source/blender/deflate/intern/BLO_deflate.c
@@ -33,6 +33,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "zlib.h"
 

diff --git a/source/blender/readblenfile/intern/BLO_readblenfile.c b/source/blender/readblenfile/intern/BLO_readblenfile.c
index f77ffaac735540c67d1bfdd596456e79ee008bff..902066fbbebd1eca30ddee98a1ef43ef08e089bf 100644 (file)
--- a/source/blender/readblenfile/intern/BLO_readblenfile.c
+++ b/source/blender/readblenfile/intern/BLO_readblenfile.c
@@ -431,7 +431,6 @@ BLO_readblenfilememory(
        int fromBufferSize, 
        BlendReadError *error_r)
 {
-       static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_readblenfilememory\n";
        int magiclen = strlen(headerMagic);
        BlendFileData *bfd = NULL;
 
@@ -495,7 +494,6 @@ BLO_readblenfilehandle(
        int fd, 
        BlendReadError *error_r)
 {
-       static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_readblenfilehandle\n";
        int magiclen = strlen(headerMagic);
        BlendFileData *bfd = NULL;
        char tempbuffer[256];
@@ -543,7 +541,6 @@ BLO_readblenfilename(
        char *fileName, 
        BlendReadError *error_r)
 {
-       static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_readblenfilename\n";
        BlendFileData *bfd = NULL;
        int fd;
 
@@ -603,7 +600,6 @@ blo_read_runtime(
        char *path, 
        BlendReadError *error_r) 
 {
-       static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_read_runtime\n";
        BlendFileData *bfd= NULL;
        int fd, datastart;
        char buf[8];

diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c
index fbb24c48d5fd04f5b1c4914ee2b94c86b4daab21..0cb9b75bf73f4554626722f74cfc90d7caf0c93c 100644 (file)
--- a/source/blender/src/drawaction.c
+++ b/source/blender/src/drawaction.c
@@ -114,11 +114,8 @@ void meshactionbuts(SpaceAction *saction, Key *key)
 {
        int           i;
        char          str[64];
-       char          keyname[32];
-       float           x, y, ybase;
+       float           x, y;
        uiBlock       *block;
-       uiBut         *but;
-    short ofsx, ofsy = 0; 
 #define RVKBGCOL .6, .65, .7
 #define XIC 20
 #define YIC 20

diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c
index e88a807d215310b4e12558e5afc540a28b712175..7ca567a34c498f99d149a371429f953897ba2146 100644 (file)
--- a/source/blender/src/edit.c
+++ b/source/blender/src/edit.c
@@ -761,7 +761,7 @@ void snap_sel_to_curs()
        TransVert *tv;
        Base *base;
        Object *ob;
-       float gridf, *curs, imat[3][3], bmat[3][3], vec[3];
+       float *curs, imat[3][3], bmat[3][3], vec[3];
        int a;
 
        curs= give_cursor();
@@ -933,7 +933,7 @@ void snap_curs_to_firstsel()
        TransVert *tv;
        Base *base;
        float *curs, bmat[3][3], vec[3], min[3], max[3], centroid[3];
-       int count, a;
+       int count;
 
        curs= give_cursor();
 
@@ -1005,7 +1005,7 @@ void snap_to_center()
        TransVert *tv;
        Base *base;
        Object *ob;
-       float gridf, snaploc[3], imat[3][3], bmat[3][3], vec[3], min[3], max[3], centroid[3];
+       float snaploc[3], imat[3][3], bmat[3][3], vec[3], min[3], max[3], centroid[3];
        int count, a;
 
 

diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c
index dbde1c22d84a55f3f1224d112e55568217cbafea..7d41fc643ad85ac8261ce8e133b9efda24d5aea7 100644 (file)
--- a/source/blender/src/editaction.c
+++ b/source/blender/src/editaction.c
@@ -122,8 +122,6 @@ static void transform_meshchannel_keys(char mode, Key *key);
 static void select_poseelement_by_name (char *name, int select);
 static void hilight_channel (bAction *act, bActionChannel *chan, short hilight);
 static void set_action_key_time (bAction *act, bPoseChannel *chan, int adrcode, short makecurve, float time);
-static void clever_numbuts_meshaction(Key *key, short* mval);
-
 /* Implementation */
 
 short showsliders = 0;
@@ -2142,7 +2140,6 @@ void winqreadactionspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
        unsigned short event= evt->event;
        short val= evt->val;
-       char ascii= evt->ascii;
        SpaceAction *saction;
        bAction *act;
        int doredraw= 0;
@@ -2487,7 +2484,7 @@ int get_nearest_key_num(Key *key, short *mval, float *x) {
 static void clever_keyblock_names(Key *key, short* mval){
     int        but=0, i, keynum;
     char       str[64];
-       float      x, min, max;
+       float      x;
        KeyBlock   *kb;
        /* get the keynum cooresponding to the y value
         * of the mouse pointer, return if this is

diff --git a/source/blender/src/editimasel.c b/source/blender/src/editimasel.c
index 76594c62ad8cb3eddca3fd778e1a2111482a0bb0..6cb680d16d9a35c61a968339be9a8a33ac22f926 100644 (file)
--- a/source/blender/src/editimasel.c
+++ b/source/blender/src/editimasel.c
@@ -89,7 +89,6 @@ void winqreadimaselspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
        unsigned short event= evt->event;
        short val= evt->val;
-       char ascii= evt->ascii;
        SpaceImaSel *simasel;
        
        short mval[2];

diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c
index 7ac6a1d86fc3f48dfe609ffe93bf134978975b11..94bbcabbccee50e5039f3c973ab17fe641eb5966 100644 (file)
--- a/source/blender/src/editnla.c
+++ b/source/blender/src/editnla.c
@@ -115,7 +115,6 @@ void winqreadnlaspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
        unsigned short event= evt->event;
        short val= evt->val;
-       char ascii= evt->ascii;
        SpaceNla *snla = curarea->spacedata.first;
        int doredraw= 0;
        short   mval[2];

diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 00748187cf3888afa707f08fcf9eedce2460f97a..fcaf29d51901a68cd54b98e7d64dfb2fa40966ba 100644 (file)
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -1738,9 +1738,7 @@ void convertmenu(void)
 
 void flip_subdivison(Object *ob, int level)
 {
-       Base *base;
-       Mesh *me, *tme;
-       short i, j;
+       Mesh *me;
 
        me = ob->data;
 

diff --git a/source/blender/src/editoops.c b/source/blender/src/editoops.c
index 9612024cd1855c3ca950fcad2c64850d92571f24..562931c0a99bef0842f384a8e07c7a9a8fe9fa59 100644 (file)
--- a/source/blender/src/editoops.c
+++ b/source/blender/src/editoops.c
@@ -609,7 +609,6 @@ void clever_numbuts_oops()
 {
        Oops *oops;
        Object *ob;
-       ID *id = idt;
        char str1[10];
        static char naam[256];
        static char naam2[256];

diff --git a/source/blender/src/editsound.c b/source/blender/src/editsound.c
index 27a68a76153da29df42441f5ceb832fed6d815ed..29942926d5f54de7d64f319a02a54c47635be64b 100644 (file)
--- a/source/blender/src/editsound.c
+++ b/source/blender/src/editsound.c
@@ -101,7 +101,6 @@ void winqreadsoundspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
        unsigned short event= evt->event;
        short val= evt->val;
-       char ascii= evt->ascii;
        float dx, dy;
        int doredraw= 0, cfra, first = 0;
        short mval[2];

diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c
index 9c4d54ba4942a6c4a46c5189af33233f50605e2a..5c98b465d0166528d91e7129538780b1ca51b114 100644 (file)
--- a/source/blender/src/filesel.c
+++ b/source/blender/src/filesel.c
@@ -1797,7 +1797,7 @@ static void fs_fake_users(SpaceFile *sfile)
 
 static int get_hilited_entry(SpaceFile *sfile)
 {
-       int a, count=0;
+       int a;
 
        for(a=0; a<sfile->totfile; a++) {
                if(sfile->filelist[a].flags & HILITE) {
@@ -1812,7 +1812,6 @@ void winqreadfilespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
        unsigned short event= evt->event;
        short val= evt->val;
-       char ascii= evt->ascii;
        static int acto=0;
        SpaceFile *sfile;
        int act, do_draw= 0, i, test, ret = 0;

diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 304b3b990a93d6fd9a85b50ea146ed486fe445cc..60c2c76d13cf7be1820cb753e76a430b969843cb 100644 (file)
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -463,8 +463,8 @@ void select_parent(void)    /* Makes parent active and de-selected OBACT */
 void group_menu(void)
 {
        Base *base;
-       short nr, len;
-       char *str, tstr[40];
+       short nr;
+       char *str;
 
        /* make menu string */
        

diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index 57120f66b9599dd727c5605c07fd216463991752..b79d98cfdb4443bcdf6d462913f6703667fedd07 100644 (file)
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -134,8 +134,6 @@
 void BIF_read_file(char *name)
 {
        extern short winqueue_break; /* editscreen.c */
-       extern char datatoc_splash_jpg[];
-       extern int datatoc_splash_jpg_size;
 
        //here?
        //sound_end_all_sounds();
@@ -159,9 +157,9 @@ int BIF_read_homefile(void)
        char tstr[FILE_MAXDIR+FILE_MAXFILE], scestr[FILE_MAXDIR];
        char *home= BLI_gethome();
        int success;
+#ifdef _WIN32  // FULLSCREEN
        static int screenmode = -1;
 
-#ifdef _WIN32  // FULLSCREEN
        screenmode = U.uiflag & FLIPFULLSCREEN;
 #endif
 
@@ -519,8 +517,6 @@ extern ListBase editelems;
 
 void exit_usiblender(void)
 {
-       extern char *fsmenu;    /* filesel.c */
-       
        freeAllRad();
        BKE_freecubetable();
 

diff --git a/source/blender/writeblenfile/intern/BLO_writeblenfile.c b/source/blender/writeblenfile/intern/BLO_writeblenfile.c
index de8e70017cade3ccf76a0daba1a8e81ec9a29e34..ab459359822f787bce1b962dfcba495525fd0e04 100644 (file)
--- a/source/blender/writeblenfile/intern/BLO_writeblenfile.c
+++ b/source/blender/writeblenfile/intern/BLO_writeblenfile.c
@@ -111,7 +111,6 @@ int BLO_writeblenfile(
        unsigned int dataIn,
        struct streamGlueHeaderStruct *streamGlueHeader)
 {
-       static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_writeblenfile\n";
        struct BLO_writeblenfileStruct *writeblenfileStruct = 0;
        int fileDes;    
        extern int mywfile;

diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
index 2049f2ecc616ee954d69a5a188b5f3136e01e870..b04ae2a9557f1602a7da7b6feab96d1c411b3d4a 100644 (file)
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
@@ -174,7 +174,7 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
                if (objectdrawmode & RAS_IPolyMaterial::SHADOW)
                {
                        // shadow must be cast to the ground, physics system needed here!
-                       KX_GameObject* gameobj = (KX_GameObject*) this->m_clientobject;
+                       // KX_GameObject* gameobj = (KX_GameObject*) this->m_clientobject;
                        MT_Point3 frompoint(oglmatrix[12],oglmatrix[13],oglmatrix[14]);
                        MT_Vector3 direction = MT_Vector3(0,0,-1);
 
@@ -182,7 +182,7 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
                        direction.normalize();
                        direction *= 100000;
 
-                       MT_Point3 topoint = frompoint + direction;
+                       // MT_Point3 topoint = frompoint + direction;
                        MT_Point3 resultpoint;
                        MT_Vector3 resultnormal;