diff options
author | Kent Mein <mein@cs.umn.edu> | 2002-12-20 05:08:46 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2002-12-20 05:08:46 +0300 |
commit | e49aeb84688180b3f9ef2c831ac509d8475ab3fe (patch) | |
tree | 9d408a2c2569bb88420ce8b3ebcdfa80d21ea7e8 | |
parent | cf13c60fa4b8cbeadd557eba6cf2d687768ba537 (diff) |
In stubs.c I added a dummy return to functions that were non void types.
in readfile.c I renamed some localvars that were named main to mainl in
a couple of functions.
in action.c I initalized a var to 0. This is probably not needed but
its a little safer incase someone adds more modes...
I've included a diff of this last one below.
Kent
Index: action.c
===================================================================
RCS file: /cvs01/blender/source/blender/blenkernel/intern/action.c,v
retrieving revision 1.6
diff -u -r1.6 action.c
--- action.c 2002/11/25 12:01:52 1.6
+++ action.c 2002/12/20 02:06:27
@@ -153,7 +153,7 @@
){
bConstraint *dcon;
const bConstraint *scon;
- float dstweight;
+ float dstweight = 0;
switch (mode){
case POSE_BLEND:
-rw-r--r-- | source/blender/blenkernel/bad_level_call_stubs/stubs.c | 16 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/action.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 26 | ||||
-rw-r--r-- | source/blender/bpython/intern/opy_nmesh.c | 1 |
4 files changed, 24 insertions, 21 deletions
diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c index 1c6d539e8a2..01e2acfb6c7 100644 --- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c +++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c @@ -87,7 +87,7 @@ ListBase editNurb; #include "DNA_world_types.h" /* for render_types */ #include "render_types.h" struct RE_Render R; -float RE_Spec(float inp, int hard){} +float RE_Spec(float inp, int hard){return 0;} void waitcursor(int val){} void allqueue(unsigned short event, short val){} #define REDRAWVIEW3D 0x4010 @@ -102,7 +102,7 @@ void load_editMesh(void){} void make_editMesh(void){} void free_editMesh(void){} void docentre_new(void){} -int saveover(char *str){} +int saveover(char *str){ return 0;} /* image.c */ #include "DNA_image_types.h" @@ -122,11 +122,11 @@ ListBase editelems; /* object.c */ void BPY_free_scriptlink(ScriptLink *slink){} void BPY_copy_scriptlink(ScriptLink *scriptlink){} -float *give_cursor(void){} // become a callback or argument +float *give_cursor(void){ return 0;} // become a callback or argument /* packedFile.c */ -short pupmenu(char *instr){} // will be general callback +short pupmenu(char *instr){ return 0;} // will be general callback /* sca.c */ #define LEFTMOUSE 0x001 // because of mouse sensor @@ -179,9 +179,13 @@ int BPY_call_importloader(char *name) /* struct EnvMap; */ /* struct Tex; */ void RE_free_envmap(struct EnvMap *env){} -struct EnvMap *RE_copy_envmap(struct EnvMap *env){} +struct EnvMap *RE_copy_envmap(struct EnvMap *env){ return env;} void RE_free_envmapdata(struct EnvMap *env){} -int RE_envmaptex(struct Tex *tex, float *texvec, float *dxt, float *dyt){} + +int RE_envmaptex(struct Tex *tex, float *texvec, float *dxt, float *dyt){ + return 0; +} + void RE_calc_R_ref(void){} char texstr[15][8]; /* buttons.c */ Osa O; diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 46132db027b..96c9bbec420 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -153,7 +153,7 @@ blend_constraints( ){ bConstraint *dcon; const bConstraint *scon; - float dstweight; + float dstweight = 0; switch (mode){ case POSE_BLEND: diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 0430921d92e..07d7c7fcc5a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -386,10 +386,10 @@ static void add_main_to_main(Main *mainvar, Main *from) void blo_join_main(ListBase *mainlist) { - Main *tojoin, *main= mainlist->first; + Main *tojoin, *mainl= mainlist->first; - while (tojoin= main->next) { - add_main_to_main(main, tojoin); + while (tojoin= mainl->next) { + add_main_to_main(mainl, tojoin); BLI_remlink(mainlist, tojoin); MEM_freeN(tojoin); } @@ -423,21 +423,21 @@ static void split_libdata(ListBase *lb, Main *first) void blo_split_main(ListBase *mainlist) { - Main *main= mainlist->first; + Main *mainl= mainlist->first; ListBase *lbarray[30]; Library *lib; int i; - for (lib= main->library.first; lib; lib= lib->id.next) { + for (lib= mainl->library.first; lib; lib= lib->id.next) { Main *libmain= MEM_callocN(sizeof(*libmain), "libmain"); libmain->curlib= lib; BLI_addtail(mainlist, libmain); } - i= set_listbasepointers(main, lbarray); + i= set_listbasepointers(mainl, lbarray); while(i--) - split_libdata(lbarray[i], main->next); + split_libdata(lbarray[i], mainl->next); } static Main *blo_find_main(ListBase *mainlist, char *name) @@ -3804,7 +3804,7 @@ BlendFileData *blo_read_file_internal(FileData *fd, BlendReadError *error_r) { BHead *bhead= blo_firstbhead(fd); BlendFileData *bfd; - FileGlobal *fg; + FileGlobal *fg = (FileGlobal *)NULL; bfd= MEM_callocN(sizeof(*bfd), "blendfiledata"); bfd->main= MEM_callocN(sizeof(*bfd->main), "main"); @@ -4464,7 +4464,7 @@ void BLO_library_append(SpaceFile *sfile, char *dir, int idcode) { FileData *fd= (FileData*) sfile->libfiledata; ListBase mainlist; - Main *main; + Main *mainl; int a, totsel=0; /* zijn er geselecteerde files? */ @@ -4499,21 +4499,21 @@ void BLO_library_append(SpaceFile *sfile, char *dir, int idcode) blo_split_main(&mainlist); /* welke moeten wij hebben? */ - main= blo_find_main(&mainlist, dir); + mainl = blo_find_main(&mainlist, dir); if(totsel==0) { - append_named_part(sfile, main, G.scene, sfile->file, idcode); + append_named_part(sfile, mainl, G.scene, sfile->file, idcode); } else { for(a=0; a<sfile->totfile; a++) { if(sfile->filelist[a].flags & ACTIVE) { - append_named_part(sfile, main, G.scene, sfile->filelist[a].relname, idcode); + append_named_part(sfile, mainl, G.scene, sfile->filelist[a].relname, idcode); } } } /* de main consistent maken */ - expand_main(fd, main); + expand_main(fd, mainl); /* als expand nog andere libs gevonden heeft: */ read_libraries(fd, &mainlist); diff --git a/source/blender/bpython/intern/opy_nmesh.c b/source/blender/bpython/intern/opy_nmesh.c index 6d1cbc2ecd8..46680278896 100644 --- a/source/blender/bpython/intern/opy_nmesh.c +++ b/source/blender/bpython/intern/opy_nmesh.c @@ -1352,7 +1352,6 @@ static int check_validFaceUV(NMesh *nmesh) faces = nmesh->faces; for (i = 0; i < PySequence_Length(faces); i++) { nmface = (NMFace *) PyList_GetItem(faces, i); - n = n = PySequence_Length(nmface->uv); if (n != PySequence_Length(nmface->v)) { |