diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-16 23:06:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-16 23:06:38 +0400 |
| commit | 9d05ccf9e84510ca7e3fe140f6e20991a931b8ce (patch) | |
| tree | f8f7241b779c9049d853a5e824db2dd150228ebe /source/blender/blenloader | |
| parent | 707fcc42a390e91aedd858588c30d04fea43f0e6 (diff) | |
| parent | 1af839081b7adcc3ceb13e5e7cc579b309e90915 (diff) | |
svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 287d3f071ee..3053e834dbc 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1981,7 +1981,7 @@ static void direct_link_nladata_strips(FileData *fd, ListBase *list) /* strip's F-Modifiers */ link_list(fd, &strip->modifiers); - direct_link_modifiers(fd, &strip->modifiers); + direct_link_fmodifiers(fd, &strip->modifiers); } } |