merged changes to revision 24446

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f6e216b36e8b216847d9101b7b33de469af1136d..7cdcbff1dae106c51b65c4fec0471a8f27b6c178 100644 (file)
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4267,6 +4267,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;


@@ -4437,6 +4438,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);