Merging r38220 through r38236 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenloader / intern / readfile.c
index 6ff24a418fabdb951cd28d910043617e280aeb97..d705c6bebfd7381cfb7d56fb332f4394ca16ca1f 100644 (file)
@@ -4880,7 +4880,6 @@ static void lib_link_screen(FileData *fd, Main *main)
                                        else if(sl->spacetype==SPACE_FILE) {
                                                SpaceFile *sfile= (SpaceFile *)sl;
                                                sfile->files= NULL;
-                                               sfile->params= NULL;
                                                sfile->op= NULL;
                                                sfile->layout= NULL;
                                                sfile->folders_prev= NULL;
@@ -5504,7 +5503,7 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
                                sfile->files= NULL;
                                sfile->layout= NULL;
                                sfile->op= NULL;
-                               sfile->params= NULL;
+                               sfile->params= newdataadr(fd, sfile->params);
                        }
                }