diff options
| author | Joshua Leung <aligorith@gmail.com> | 2006-12-05 02:27:53 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2006-12-05 02:27:53 +0300 |
| commit | 9b8258dabcd0a70d25e6090deebb2e4969bfaaf5 (patch) | |
| tree | 51d1470a89547d5f9ad8fb7fa9fabe65e4b2df95 /source/blender/blenloader | |
| parent | 6faf0ac81694061b6b4809cc375da887fcc4d042 (diff) | |
Resolved a few compiler warnings:
* Line 2451: unusued variable 'removed'
* Line 3513: implicit declaration of function freeN. should be MEM_freeN
Hopefully I didn't break anything.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c7e4dd2c78d..a61e254c533 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2448,7 +2448,7 @@ static void direct_link_dverts(FileData *fd, int count, MDeformVert *mdverts) static void direct_link_customdata(FileData *fd, CustomData *data, int count) { - int i = 0, removed; + int i = 0; data->layers= newdataadr(fd, data->layers); @@ -3510,7 +3510,7 @@ void lib_link_screen_restore(Main *newmain, Scene *curscene) if(v3d->bgpic) { v3d->bgpic->ima= restore_pointer_by_name(newmain, (ID *)v3d->bgpic->ima, 1); v3d->bgpic->tex= restore_pointer_by_name(newmain, (ID *)v3d->bgpic->tex, 1); - if(v3d->bgpic->rect) freeN(v3d->bgpic->rect); + if(v3d->bgpic->rect) MEM_freeN(v3d->bgpic->rect); v3d->bgpic->rect= NULL; } if(v3d->localvd) { |