[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21985] branches/blender2.5/blender/source /blender/editors: 2.5 file browser

[Andrea Weikert]

Revision: 21985
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21985
Author:   elubie
Date:     2009-07-28 20:20:16 +0200 (Tue, 28 Jul 2009)

Log Message:
-----------
2.5 file browser
* Bugfix: keep the filename when changing directory, either by clicking on it or by selecting a bookmark
* MSVC uninitialized variable runtime check fix in widget_draw_text

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

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-07-28 18:14:53 UTC (rev 21984)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-07-28 18:20:16 UTC (rev 21985)
@@ -780,7 +780,7 @@
 		
 	/* text button selection and cursor */
 	if(but->editstr && but->pos != -1) {
-		short t, pos, ch;
+		short t=0, pos=0, ch;
 		short selsta_tmp, selend_tmp, selsta_draw, selwidth_draw;
 		
 		if ((but->selend - but->selsta) > 0) {

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-07-28 18:14:53 UTC (rev 21984)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c	2009-07-28 18:20:16 UTC (rev 21985)
@@ -157,7 +157,6 @@
 					BLI_add_slash(params->dir);
 				}
 
-				params->file[0] = '\0';
 				file_change_dir(sfile);
 				retval = FILE_SELECT_DIR;
 			}
@@ -322,7 +321,6 @@
 		BLI_strncpy(params->dir, entry, sizeof(params->dir));
 		BLI_cleanup_dir(G.sce, params->dir);
 		file_change_dir(sfile);				
-		params->file[0] = '\0';
 
 		WM_event_add_notifier(C, NC_FILE|ND_FILELIST, NULL);
 	}