[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23368] trunk/blender/source/blender/ editors: 2.5 filebrowser

[Andrea Weikert]

Revision: 23368
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23368
Author:   elubie
Date:     2009-09-20 17:30:52 +0200 (Sun, 20 Sep 2009)

Log Message:
-----------
2.5 filebrowser
* changed filebrowser operator property "filename" to "path" - fixed two missing operators.
* small cleanup in init of filebrowser

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/editfont.c
    trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
    trunk/blender/source/blender/editors/space_file/filesel.c

Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c	2009-09-20 15:13:01 UTC (rev 23367)
+++ trunk/blender/source/blender/editors/curve/editfont.c	2009-09-20 15:30:52 UTC (rev 23368)
@@ -381,19 +381,19 @@
 
 static int paste_file_exec(bContext *C, wmOperator *op)
 {
-	char *filename;
+	char *path;
 	int retval;
 	
-	filename= RNA_string_get_alloc(op->ptr, "filename", NULL, 0);
-	retval= paste_file(C, op->reports, filename);
-	MEM_freeN(filename);
+	path= RNA_string_get_alloc(op->ptr, "path", NULL, 0);
+	retval= paste_file(C, op->reports, path);
+	MEM_freeN(path);
 
 	return retval;
 }
 
 static int paste_file_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	if(RNA_property_is_set(op->ptr, "filename"))
+	if(RNA_property_is_set(op->ptr, "path"))
 		return paste_file_exec(C, op);
 
 	WM_event_add_fileselect(C, op); 

Modified: trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_ops.c	2009-09-20 15:13:01 UTC (rev 23367)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_ops.c	2009-09-20 15:30:52 UTC (rev 23368)
@@ -1107,7 +1107,7 @@
 	op->customdata= fbo;
 
 	str= RNA_property_string_get_alloc(&ptr, prop, 0, 0);
-	RNA_string_set(op->ptr, "filename", str);
+	RNA_string_set(op->ptr, "path", str);
 	MEM_freeN(str);
 
 	WM_event_add_fileselect(C, op); 

Modified: trunk/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filesel.c	2009-09-20 15:13:01 UTC (rev 23367)
+++ trunk/blender/source/blender/editors/space_file/filesel.c	2009-09-20 15:30:52 UTC (rev 23368)
@@ -117,8 +117,6 @@
 		BLI_strncpy(sfile->params->file, file, sizeof(sfile->params->file));
 		BLI_make_file_string(G.sce, sfile->params->dir, dir, ""); /* XXX needed ? - also solve G.sce */
 	}
-	
-	ED_fileselect_reset_params(sfile);
 
 	params = sfile->params;