diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-07-11 07:23:45 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-07-11 07:23:45 +0400 |
| commit | 576a642ff9b5ca5094f5bb84ada3c5639ae01a92 (patch) | |
| tree | 950a5f5ce861a8fa04fb2727e0e65a464ccbab9c /source/blender/blenloader/intern/readfile.c | |
| parent | 1105ee701ed20d6301a174fc4285de00f8e0f95e (diff) | |
| parent | b80b581bc03b6df28bd3a10118d85b78d5ca011b (diff) | |
NLA SoC: Merge from 2.5 soc-2009-aligorith
21470 to 21512
Next up, NLA-branch to 2.5 :)
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c475ed5a949..846e54526b8 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2720,6 +2720,7 @@ static void direct_link_image(FileData *fd, Image *ima) ima->anim= NULL; ima->rr= NULL; ima->repbind= NULL; + ima->render_text= newdataadr(fd, ima->render_text); ima->packedfile = direct_link_packedfile(fd, ima->packedfile); ima->preview = direct_link_preview_image(fd, ima->preview); |