diff options
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b6c1bd1c7bc..ebd407e7e21 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -704,7 +704,7 @@ BHead *blo_firstbhead(FileData *fd) return(bhead); } -BHead *blo_prevbhead(FileData *fd, BHead *thisblock) +BHead *blo_prevbhead(FileData *UNUSED(fd), BHead *thisblock) { BHeadN *bheadn= (BHeadN *) (((char *) thisblock) - GET_INT_FROM_POINTER( &((BHeadN*)0)->bhead) ); BHeadN *prev= bheadn->prev; @@ -1155,7 +1155,7 @@ static void change_idid_adr(ListBase *mainlist, FileData *basefd, void *old, voi * to clear that pointer before reading the undo memfile since * the object might be removed, it is set again in reading * if the local object still exists */ -void blo_clear_proxy_pointers_from_lib(FileData *fd, Main *oldmain) +void blo_clear_proxy_pointers_from_lib(Main *oldmain) { Object *ob= oldmain->object.first; @@ -1442,7 +1442,7 @@ static void IDP_DirectLinkArray(IDProperty *prop, int switch_endian, FileData *f } } -static void IDP_DirectLinkString(IDProperty *prop, int switch_endian, FileData *fd) +static void IDP_DirectLinkString(IDProperty *prop, FileData *fd) { /*since we didn't save the extra string buffer, set totallen to len.*/ prop->totallen = prop->len; @@ -1469,7 +1469,7 @@ void IDP_DirectLinkProperty(IDProperty *prop, int switch_endian, FileData *fd) IDP_DirectLinkGroup(prop, switch_endian, fd); break; case IDP_STRING: - IDP_DirectLinkString(prop, switch_endian, fd); + IDP_DirectLinkString(prop, fd); break; case IDP_ARRAY: IDP_DirectLinkArray(prop, switch_endian, fd); @@ -1499,7 +1499,7 @@ void IDP_DirectLinkProperty(IDProperty *prop, int switch_endian, FileData *fd) } /*stub function*/ -void IDP_LibLinkProperty(IDProperty *prop, int switch_endian, FileData *fd) +void IDP_LibLinkProperty(IDProperty *UNUSED(prop), int UNUSED(switch_endian), FileData *UNUSED(fd)) { } @@ -1552,7 +1552,7 @@ static void direct_link_brush(FileData *fd, Brush *brush) brush->icon_imbuf= NULL; } -static void direct_link_script(FileData *fd, Script *script) +static void direct_link_script(FileData *UNUSED(fd), Script *script) { script->id.us = 1; SCRIPT_SET_NULL(script) @@ -2030,7 +2030,7 @@ static void lib_link_nodetree(FileData *fd, Main *main) /* verify types for nodes and groups, all data has to be read */ /* open = 0: appending/linking, open = 1: open new file (need to clean out dynamic * typedefs*/ -static void lib_verify_nodetree(Main *main, int open) +static void lib_verify_nodetree(Main *main, int UNUSED(open)) { Scene *sce; Material *ma; @@ -2139,7 +2139,7 @@ typedef struct tConstraintLinkData { ID *id; } tConstraintLinkData; /* callback function used to relink constraint ID-links */ -static void lib_link_constraint_cb(bConstraint *con, ID **idpoin, void *userdata) +static void lib_link_constraint_cb(bConstraint *UNUSED(con), ID **idpoin, void *userdata) { tConstraintLinkData *cld= (tConstraintLinkData *)userdata; *idpoin = newlibadr(cld->fd, cld->id->lib, *idpoin); @@ -2534,7 +2534,7 @@ static void direct_link_world(FileData *fd, World *wrld) /* ************ READ VFONT ***************** */ -static void lib_link_vfont(FileData *fd, Main *main) +static void lib_link_vfont(FileData *UNUSED(fd), Main *main) { VFont *vf; @@ -2555,7 +2555,7 @@ static void direct_link_vfont(FileData *fd, VFont *vf) /* ************ READ TEXT ****************** */ -static void lib_link_text(FileData *fd, Main *main) +static void lib_link_text(FileData *UNUSED(fd), Main *main) { Text *text; @@ -5261,7 +5261,7 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main) lib->parent= NULL; } -static void lib_link_library(FileData *fd, Main *main) +static void lib_link_library(FileData *UNUSED(fd), Main *main) { Library *lib; for(lib= main->library.first; lib; lib= lib->id.next) { @@ -6473,7 +6473,7 @@ static void do_version_mtex_factor_2_50(MTex **mtex_array, short idtype) } } -static void do_version_mdef_250(FileData *fd, Library *lib, Main *main) +static void do_version_mdef_250(Main *main) { Object *ob; ModifierData *md; @@ -10899,7 +10899,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } - do_version_mdef_250(fd, lib, main); + do_version_mdef_250(main); /* parent type to modifier */ for(ob = main->object.first; ob; ob = ob->id.next) { @@ -11291,7 +11291,7 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filename) lib_link_all(fd, bfd->main); //do_versions_after_linking(fd, NULL, bfd->main); // XXX: not here (or even in this function at all)! this causes crashes on many files - Aligorith (July 04, 2010) - lib_verify_nodetree(bfd->main, 1); + lib_verify_nodetree(bfd->main, TRUE); fix_relpaths_library(fd->relabase, bfd->main); /* make all relative paths, relative to the open blend file */ link_global(fd, bfd); /* as last */ @@ -11776,7 +11776,7 @@ typedef struct tConstraintExpandData { Main *mainvar; } tConstraintExpandData; /* callback function used to expand constraint ID-links */ -static void expand_constraint_cb(bConstraint *con, ID **idpoin, void *userdata) +static void expand_constraint_cb(bConstraint *UNUSED(con), ID **idpoin, void *userdata) { tConstraintExpandData *ced= (tConstraintExpandData *)userdata; expand_doit(ced->fd, ced->mainvar, *idpoin); @@ -12461,7 +12461,7 @@ static void library_append_end(const bContext *C, Main *mainl, FileData **fd, in mainl= NULL; /* blo_join_main free's mainl, cant use anymore */ lib_link_all(*fd, mainvar); - lib_verify_nodetree(mainvar, 0); + lib_verify_nodetree(mainvar, FALSE); fix_relpaths_library(G.sce, mainvar); /* make all relative paths, relative to the open blend file */ /* give a base to loose objects. If group append, do it for objects too */ |