Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r--source/blender/blenloader/intern/readfile.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 7ba17ced089..b10c13eef8d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4653,9 +4653,12 @@ static void lib_link_screen(FileData *fd, Main *main)
}
else if(sl->spacetype==SPACE_IPO) {
SpaceIpo *sipo= (SpaceIpo *)sl;
+ bDopeSheet *ads= sipo->ads;
- if(sipo->ads)
- sipo->ads->source= newlibadr(fd, sc->id.lib, sipo->ads->source);
+ if (ads) {
+ ads->source= newlibadr(fd, sc->id.lib, ads->source);
+ ads->filter_grp= newlibadr(fd, sc->id.lib, ads->filter_grp);
+ }
}
else if(sl->spacetype==SPACE_BUTS) {
SpaceButs *sbuts= (SpaceButs *)sl;
@@ -4686,8 +4689,14 @@ static void lib_link_screen(FileData *fd, Main *main)
}
else if(sl->spacetype==SPACE_ACTION) {
SpaceAction *saction= (SpaceAction *)sl;
+ bDopeSheet *ads= &saction->ads;
+
+ if (ads) {
+ ads->source= newlibadr(fd, sc->id.lib, ads->source);
+ ads->filter_grp= newlibadr(fd, sc->id.lib, ads->filter_grp);
+ }
+
saction->action = newlibadr(fd, sc->id.lib, saction->action);
- saction->ads.source= newlibadr(fd, sc->id.lib, saction->ads.source);
}
else if(sl->spacetype==SPACE_IMAGE) {
SpaceImage *sima= (SpaceImage *)sl;
@@ -4695,7 +4704,13 @@ static void lib_link_screen(FileData *fd, Main *main)
sima->image= newlibadr_us(fd, sc->id.lib, sima->image);
}
else if(sl->spacetype==SPACE_NLA){
- /* SpaceNla *snla= (SpaceNla *)sl; */
+ SpaceNla *snla= (SpaceNla *)sl;
+ bDopeSheet *ads= snla->ads;
+
+ if (ads) {
+ ads->source= newlibadr(fd, sc->id.lib, ads->source);
+ ads->filter_grp= newlibadr(fd, sc->id.lib, ads->filter_grp);
+ }
}
else if(sl->spacetype==SPACE_TEXT) {
SpaceText *st= (SpaceText *)sl;