griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- assorted minor warning fixes

Browse Source
This commit is contained in:
Daniel Dunbar
2005-09-03 16:20:33 +00:00
parent fdc1fd1e9c
commit e0c7d270d9
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/intern/readfile.c
View 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... */

3
source/blender/src/editmesh_tools.c
View 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));

2
source/blender/src/headerbuttons.c
View 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;
}
}
}

4
source/blender/src/renderwin.c
View 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);
}

2
source/blender/src/transform_constraints.c
View File

@@ -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;