[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19294] branches/blender2.5/blender/source /blender/editors/space_file: 2.5 filebrowser

[Andrea Weikert]

Revision: 19294
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19294
Author:   elubie
Date:     2009-03-14 21:42:58 +0100 (Sat, 14 Mar 2009)

Log Message:
-----------
2.5 filebrowser
compile error fix, missed one change in last commit

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
    branches/blender2.5/blender/source/blender/editors/space_file/filelist.c

Modified: 
branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c    
2009-03-14 18:15:28 UTC (rev 19293)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c    
2009-03-14 20:42:58 UTC (rev 19294)
@@ -211,7 +211,7 @@
        rect.xmax= RNA_int_get(op->ptr, "xmax");
        rect.ymax= RNA_int_get(op->ptr, "ymax");
 
-       file_select(sfile, sfile->params, ar, &rect, val );
+       file_select(sfile, ar, &rect, val );
        WM_event_add_notifier(C, NC_WINDOW, NULL);
        return OPERATOR_FINISHED;
 }

Modified: 
branches/blender2.5/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/filelist.c    
2009-03-14 18:15:28 UTC (rev 19293)
+++ branches/blender2.5/blender/source/blender/editors/space_file/filelist.c    
2009-03-14 20:42:58 UTC (rev 19294)
@@ -748,17 +748,6 @@
                
                if(BLO_has_bfile_extension(file->relname)) {
                        file->flags |= BLENDERFILE;
-                       if(filelist->type==FILE_LOADLIB) {              
-                               char name[FILE_MAXDIR+FILE_MAXFILE];
-                               BLI_strncpy(name, filelist->dir, sizeof(name));
-                               strcat(name, file->relname);
-                               
-                               /* prevent current file being used as 
acceptable dir */
-                               if (BLI_streq(G.main->name, name)==0) {
-                                       file->type &= ~S_IFMT;
-                                       file->type |= S_IFDIR;
-                               }
-                       }
                } else if(BLI_testextensie(file->relname, ".py")) {
                                file->flags |= PYSCRIPTFILE;
                } else if(BLI_testextensie(file->relname, ".txt")) {


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