archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

The regular warning fix update; includes two variables that were used

Browse Source 
without initialization.

For Brecht:

source/blender/blenkernel/intern/subsurf_ccg.c:329: warning: left-hand operand of comma expression has no effect

This line I don't understand...
This commit is contained in:
Ton Roosendaal
2006-02-18 16:21:32 +00:00
parent f4ddc2fde2
commit 7117d7f2c3
5 changed files with 14 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenlib/intern/freetypefont.c
View File

@@ -80,14 +80,9 @@ void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vfd)
FT_GlyphSlot glyph;
FT_UInt glyph_index;
FT_Outline ftoutline;
const char *fontname;
float scale, height;
float dx, dy;
int i,j,k,l,m=0;
// Variables
int *npoints;
int *onpoints;
int j,k,l,m=0;
// adjust font size
height= ((double) face->bbox.yMax - (double) face->bbox.yMin);
@@ -106,6 +101,9 @@ void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vfd)
// If loading succeeded, convert the FT glyph to the internal format
if(!err)
{
int *npoints;
int *onpoints;
// First we create entry for the new character to the character list
che= (VChar *) MEM_callocN(sizeof(struct VChar), "objfnt_char");
BLI_addtail(&vfd->characters, che);
@@ -273,17 +271,15 @@ void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vfd)
}
}
}
if(npoints) MEM_freeN(npoints);
if(onpoints) MEM_freeN(onpoints);
}
if(npoints) MEM_freeN(npoints);
if(onpoints) MEM_freeN(onpoints);
}
int objchr_to_ftvfontdata(VFont *vfont, FT_ULong charcode)
{
// Freetype2
FT_Face face;
FT_UInt glyph_index;
struct TmpFont *tf;
// Find the correct FreeType font
@@ -324,7 +320,6 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile * pf)
FT_Face face;
FT_ULong charcode = 0, lcode;
FT_UInt glyph_index;
FT_UInt temp;
const char *fontname;
VFontData *vfd;

51
source/blender/blenlib/intern/scanfill.c
View File

@@ -73,6 +73,7 @@ void callLocalErrorCallBack(char* msg)
}
}
#if 0
/* ignore if the interrupt wasn't set */
static int callLocalInterruptCallBack(void)
{
@@ -82,7 +83,7 @@ static int callLocalInterruptCallBack(void)
return 0;
}
}
#endif
/* local types */
typedef struct PolyFill {
@@ -243,21 +244,6 @@ static void addfillface(EditVert *v1, EditVert *v2, EditVert *v3, int mat_nr)
evl->mat_nr= mat_nr;
}
static int boundinside(PolyFill *pf1, PolyFill *pf2)
{
/* is pf2 INSIDE pf1 ? using bounding box */
/* test first if polys exist */
if(pf1->edges==0 || pf2->edges==0) return 0;
if(pf2->max[cox]<pf1->max[cox])
if(pf2->max[coy]<pf1->max[coy])
if(pf2->min[cox]>pf1->min[cox])
if(pf2->min[coy]>pf1->min[coy]) return 1;
return 0;
}
static int boundisect(PolyFill *pf2, PolyFill *pf1)
{
/* has pf2 been touched (intersected) by pf1 ? with bounding box */
@@ -282,9 +268,6 @@ static int boundisect(PolyFill *pf2, PolyFill *pf1)
}
static void mergepolysSimp(PolyFill *pf1, PolyFill *pf2) /* add pf2 to pf1 */
{
EditVert *eve;
@@ -308,22 +291,6 @@ static void mergepolysSimp(PolyFill *pf1, PolyFill *pf2) /* add pf2 to pf1 */
pf1->f= (pf1->f | pf2->f);
}
static EditEdge *existfilledge(EditVert *v1, EditVert *v2)
{
EditEdge *eed;
eed= filledgebase.first;
while(eed) {
if(eed->v1==v1 && eed->v2==v2) return eed;
if(eed->v2==v1 && eed->v1==v2) return eed;
eed= eed->next;
}
return 0;
}
static short testedgeside(float *v1, float *v2, float *v3)
/* is v3 to the right of v1-v2 ? With exception: v3==v1 || v3==v2 */
{
@@ -340,18 +307,6 @@ static short testedgeside(float *v1, float *v2, float *v3)
return 1;
}
static short testedgeside2(float *v1, float *v2, float *v3)
/* is v3 to the right of v1-v2 ? no intersection allowed! */
{
float inp;
inp= (v2[cox]-v1[cox])*(v1[coy]-v3[coy])
+(v1[coy]-v2[coy])*(v1[cox]-v3[cox]);
if(inp<=0.0) return 0;
return 1;
}
static short addedgetoscanvert(ScFillVert *sc, EditEdge *eed)
{
/* find first edge to the right of eed, and insert eed before that */
@@ -421,7 +376,7 @@ static ScFillVert *addedgetoscanlist(EditEdge *eed, int len)
sc= (ScFillVert *)bsearch(&scsearch,scdata,len,
sizeof(ScFillVert), vergscdata);
if(sc==0) printf("Error in search edge: %lx\n",eed);
if(sc==0) printf("Error in search edge: %p\n",eed);
else if(addedgetoscanvert(sc,eed)==0) return sc;
return 0;

10
source/blender/blenloader/intern/readfile.c
View File

@@ -114,6 +114,7 @@
#include "BKE_depsgraph.h"
#include "BKE_effect.h" // for give_parteff
#include "BKE_global.h" // for G
#include "BKE_group.h"
#include "BKE_property.h" // for get_property
#include "BKE_lattice.h"
#include "BKE_library.h" // for wich_libbase
@@ -468,7 +469,6 @@ static Main *blo_find_main(ListBase *mainlist, const char *name, const char *rel
Main *m;
Library *lib;
char name1[FILE_MAXDIR+FILE_MAXFILE];
char libname1[FILE_MAXDIR+FILE_MAXFILE];
strcpy(name1, name);
cleanup_path(relabase, name1);
@@ -1232,7 +1232,6 @@ static void lib_verify_nodetree(Main *main)
Scene *sce;
Material *ma;
bNodeTree *ntree;
bNode *node;
/* now create the own typeinfo structs an verify nodes */
/* here we still assume no groups in groups */
@@ -3237,7 +3236,6 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
static void direct_link_library(FileData *fd, Library *lib, Main *main)
{
Main *newmain;
Library *libr;
for(newmain= fd->mainlist.first; newmain; newmain= newmain->next) {
if(newmain->curlib) {
@@ -3343,10 +3341,6 @@ static void lib_link_group(FileData *fd, Main *main)
/* ************** GENERAL & MAIN ******************** */
static char *libname(short id_code)
{
}
static char *dataname(short id_code)
{
@@ -5286,7 +5280,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
if(main->versionfile <= 241) {
Tex *tex;
// Tex *tex;
Scene *sce;
Lamp *la;
bArmature *arm;

2
source/blender/render/intern/source/zbuf.c
View File

@@ -2384,7 +2384,7 @@ static void zbuffer_abuf(RenderPart *pa, APixstr *APixbuf, ListBase *apsmbase, u
Material *ma=NULL;
VlakRen *vlr=NULL;
float vec[3], hoco[4], mul, zval, fval;
int v, zvlnr, zsample, dofill;
int v, zvlnr, zsample, dofill= 0;
unsigned short clipmask;
zbuf_alloc_span(&zspan, pa->rectx, pa->recty);

3
source/blender/src/edit.c
View File

@@ -1569,7 +1569,8 @@ void mergemenu(void)
{
short event;
int remCount;
int remCount= 0;
if(G.scene->selectmode == SCE_SELECT_VERTEX)
if(G.editMesh->firstvert && G.editMesh->lastvert) event = pupmenu("Merge %t|At First %x6|At Last%x1|At Center%x3|At Cursor%x4");
else if (G.editMesh->firstvert) event = pupmenu("Merge %t|At First %x6|At Center%x3|At Cursor%x4");