NLA SoC: Merge from 2.5 soc-2009-aligorith

21470 to 21512

Next up, NLA-branch to 2.5 :)

2 files changed, 5 insertions, 1 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);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index bfdd89e38b1..4b52da83019 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1480,7 +1480,10 @@ static void write_images(WriteData *wd, ListBase *idbase)
 
 			write_previews(wd, ima->preview);
 
-			}
+			/* exception: render text only saved in undo files (wd->current) */
+			if (ima->render_text && wd->current)
+				writedata(wd, DATA, IMA_RW_MAXTEXT, ima->render_text);
+		}
 		ima= ima->id.next;
 	}
 	/* flush helps the compression for undo-save */