diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-10 15:04:07 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-10 15:04:07 +0400 |
| commit | 190aae27ae7149945f2bf802d7cfd7691f61c45f (patch) | |
| tree | 7f64806cb35162dd12c6ed4f08309ef11771dbb1 /source/blender/blenloader | |
| parent | d2c13039ede9e50cf2aaf55651f66d4b730089af (diff) | |
| parent | 75078d62df5ee8186369b5f1273b61b0736346ec (diff) | |
svn merge -r 16369:16454 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 3 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b96ca9f3739..e403a28141c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4177,6 +4177,9 @@ static void direct_link_screen(FileData *fd, bScreen *sc) sima->cumap= newdataadr(fd, sima->cumap); if(sima->cumap) direct_link_curvemapping(fd, sima->cumap); + sima->gpd= newdataadr(fd, sima->gpd); + if (sima->gpd) + link_gpencil(fd, sima->gpd); sima->iuser.ok= 1; } else if(sl->spacetype==SPACE_NODE) { diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 179e548747d..e53c725867a 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1702,7 +1702,9 @@ static void write_screens(WriteData *wd, ListBase *scrbase) writestruct(wd, DATA, "SpaceImage", 1, sl); if(sima->cumap) - write_curvemapping(wd, sima->cumap); + write_curvemapping(wd, sima->cumap); + if(sima->gpd) + write_gpencil(wd, sima->gpd); } else if(sl->spacetype==SPACE_IMASEL) { writestruct(wd, DATA, "SpaceImaSel", 1, sl); |