merged changes to revision 24077

[blender-staging.git] / source / blender / blenloader / intern / readfile.c

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 658e238e81d6db0de6715ca90de3fbe4024c1daa..cbc72a0366df867c5678f5c52515a8892c83a140 100644 (file)
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4243,6 +4243,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
        Editing *ed;
        Sequence *seq;
        MetaStack *ms;
        Editing *ed;
        Sequence *seq;
        MetaStack *ms;

+       SceneRenderLayer *srl;

 
        sce->theDag = NULL;
        sce->dagisvalid = 0;
 
        sce->theDag = NULL;
        sce->dagisvalid = 0;


@@ -4413,6 +4414,10 @@ static void direct_link_scene(FileData *fd, Scene *sce)
        link_list(fd, &(sce->transform_spaces));
        link_list(fd, &(sce->r.layers));
        
        link_list(fd, &(sce->transform_spaces));
        link_list(fd, &(sce->r.layers));
        

+       for(srl= sce->r.layers.first; srl; srl= srl->next) {
+               link_list(fd, &(srl->freestyleConfig.modules));
+       }
+       

        sce->nodetree= newdataadr(fd, sce->nodetree);
        if(sce->nodetree)
                direct_link_nodetree(fd, sce->nodetree);
        sce->nodetree= newdataadr(fd, sce->nodetree);
        if(sce->nodetree)
                direct_link_nodetree(fd, sce->nodetree);