[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38233] trunk/blender/source/blender/ blenloader/intern: Fix #27900: file browser filter, sort, ..

[Brecht Van Lommel]

Revision: 38233
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38233
Author:   blendix
Date:     2011-07-08 12:22:48 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Fix #27900: file browser filter, sort, .. parameters were not saved. This is
useful if you have a screen setup with a file browser editor.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/blenloader/intern/writefile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c   2011-07-08 
12:18:54 UTC (rev 38232)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2011-07-08 
12:22:48 UTC (rev 38233)
@@ -4836,7 +4836,6 @@
                                        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;
@@ -5449,7 +5448,7 @@
                                sfile->files= NULL;
                                sfile->layout= NULL;
                                sfile->op= NULL;
-                               sfile->params= NULL;
+                               sfile->params= newdataadr(fd, sfile->params);
                        }
                }
                

Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c  2011-07-08 
12:18:54 UTC (rev 38232)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c  2011-07-08 
12:22:48 UTC (rev 38233)
@@ -2103,7 +2103,11 @@
                                        writestruct(wd, DATA, "SpaceButs", 1, 
sl);
                                }
                                else if(sl->spacetype==SPACE_FILE) {
+                                       SpaceFile *sfile= (SpaceFile *)sl;
+
                                        writestruct(wd, DATA, "SpaceFile", 1, 
sl);
+                                       if(sfile->params)
+                                               writestruct(wd, DATA, 
"FileSelectParams", 1, sfile->params);
                                }
                                else if(sl->spacetype==SPACE_SEQ) {
                                        writestruct(wd, DATA, "SpaceSeq", 1, 
sl);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs