- assorted minor warning fixes
authorDaniel Dunbar <daniel@zuster.org>
Sat, 3 Sep 2005 16:20:33 +0000 (16:20 +0000)
committerDaniel Dunbar <daniel@zuster.org>
Sat, 3 Sep 2005 16:20:33 +0000 (16:20 +0000)
source/blender/blenloader/intern/readfile.c
source/blender/src/editmesh_tools.c
source/blender/src/headerbuttons.c
source/blender/src/renderwin.c
source/blender/src/transform_constraints.c

index 1434e980ec033e449917dbcefb1cd4223c4a7b19..4d696fe97531a406189667df9dadb9b8453200f6 100644 (file)
@@ -4844,7 +4844,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                sce->toolsettings->step = 9;
                                sce->toolsettings->turn = 1;                            
                                sce->toolsettings->extr_offs = 1; 
-                               sce->toolsettings->doublimit = 0.001;
+                               sce->toolsettings->doublimit = 0.001f;
                                sce->toolsettings->segments = 32;
                                sce->toolsettings->rings = 32;
                                sce->toolsettings->vertices = 32;
@@ -4888,7 +4888,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                ob->softflag &= ~OB_SB_ENABLE;
                        }
                        if(ob->pose) {
-                               bPoseChannel *pchan, *parchan;
+                               bPoseChannel *pchan;
                                bConstraint *con;
                                for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
                                        /* 2.38 files can be saved wrong still... */
index 069afa27ec92d775951fda7dfec9f77d1547b5b6..8766d0470a021e63940473410a0a14d8c0f59b25 100644 (file)
@@ -4474,7 +4474,7 @@ int EdgeSlide(short immediate, float imperc)
        LinkNode *edgelist = NULL, *vertlist=NULL, *look;
        GHash *vertgh;
        SlideVert *tempsv;
-       float perc = 0, percp = 0,vertdist, projectMat[4][4], viewMat[4][4], len;
+       float perc = 0, percp = 0,vertdist, projectMat[4][4], viewMat[4][4];
        int i = 0,j, numsel, numadded=0, timesthrough = 0, vertsel=0, prop=1, cancel = 0,flip=0;
        short event, draw=1;
        short mval[2], mvalo[2];
@@ -4819,7 +4819,6 @@ int EdgeSlide(short immediate, float imperc)
                                look = vertlist;          
                                while(look){ 
                                        float newlen;
-                                       EditVert *tempev;
                                        ev = look->link;
                                        tempsv = BLI_ghash_lookup(vertgh,ev);
                                        newlen = (len / VecLenf(editedge_getOtherVert(tempsv->up,ev)->co,editedge_getOtherVert(tempsv->down,ev)->co));
index d8a5b1165df26654178e655bb61bc32de715a859..428cd7ba78bc2ace17c4204bfcb13331f35630d7 100644 (file)
@@ -281,7 +281,7 @@ int std_libbuttons(uiBlock *block, short xco, short yco,
                                if(ob==NULL) {
                                        if(G.sipo->blocktype!=ID_SEQ && G.sipo->blocktype!=ID_WO) {
                                                id= NULL; 
-                                               idwasnul= NULL;
+                                               idwasnul= 0;
                                        }
                                }
                        }
index fa0d786c9f8fd5e09a781d0087146d0780ae0dec..95ff209fc903935dcf09c4ae6cc29e14267dbd29 100644 (file)
@@ -219,8 +219,8 @@ static int renderwin_win_to_ndc(RenderWin *rw, int win_co[2], float ndc_r[2])
        window_get_size(rw->win, &w, &h);
        h-= RW_HEADERY;
 
-       ndc_r[0]=  ((float)(win_co[0]*2)/(w-1) - 1.0);
-       ndc_r[1]=  ((float)(win_co[1]*2)/(h-1) - 1.0);
+       ndc_r[0]=  ((float)(win_co[0]*2)/(w-1) - 1.0f);
+       ndc_r[1]=  ((float)(win_co[1]*2)/(h-1) - 1.0f);
 
        return (fabs(ndc_r[0])<=1.0 && fabs(ndc_r[1])<=1.0);
 }
index fcebab5412d2d659e21802337ef10fea925e813c..eed960bde94a4e94d78de01e63b3724511fb3684 100755 (executable)
@@ -165,7 +165,7 @@ static void postConstraintChecks(TransInfo *t, float vec[3], float pvec[3]) {
 }
 
 static void axisProjection(TransInfo *t, float axis[3], float in[3], float out[3]) {
-       float norm[3], n[3], n2[3], vec[3], factor;
+       float norm[3], vec[3], factor;
        
        if(in[0]==0.0f && in[1]==0.0f && in[2]==0.0f)
                return;