blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Cleanup: BLO: use proper typedef for expand_doit callback.

This commit is contained in:
Bastien Montagne 2015-10-12 14:31:47 +02:00
parent 6f41febff1
commit d24bafa0d5
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/BLO_readfile.h
View File

@ -110,7 +110,9 @@ BlendFileData *blo_read_blendafterruntime(int file, const char *name, int actual
/* internal function but we need to expose it */
void blo_lib_link_screen_restore(struct Main *newmain, struct bScreen *curscreen, struct Scene *curscene);
void BLO_main_expander(void (*expand_doit_func)(void *, struct Main *, void *));
typedef void (*BLOExpandDoitCallback) (void *fdhandle, struct Main *mainvar, void *idv);
void BLO_main_expander(BLOExpandDoitCallback expand_doit_func);
void BLO_expand_main(void *fdhandle, struct Main *mainvar);
/* Update defaults in startup.blend & userprefs.blend, without having to save and embed it */

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

@ -8624,7 +8624,7 @@ static void expand_doit_library(void *fdhandle, Main *mainvar, void *old)
}
}
static void (*expand_doit)(void *, Main *, void *);
static BLOExpandDoitCallback expand_doit;
// XXX deprecated - old animation system
static void expand_ipo(FileData *fd, Main *mainvar, Ipo *ipo)
@ -9404,7 +9404,7 @@ static void expand_gpencil(FileData *fd, Main *mainvar, bGPdata *gpd)
*
* \param expand_doit_func Called for each ID block it finds.
*/
void BLO_main_expander(void (*expand_doit_func)(void *, Main *, void *))
void BLO_main_expander(BLOExpandDoitCallback expand_doit_func)
{
expand_doit = expand_doit_func;
}