diff options
| author | Andrea Weikert <elubie@gmx.net> | 2009-09-20 19:30:52 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2009-09-20 19:30:52 +0400 |
| commit | 4b6c61e0a704a713d13090231aa73056ff48c6d4 (patch) | |
| tree | 8a689836034c2b91719d559681e803b04888765f /source | |
| parent | 85e529433b62b27680203221083481db04e867a1 (diff) | |
2.5 filebrowser
* changed filebrowser operator property "filename" to "path" - fixed two missing operators.
* small cleanup in init of filebrowser
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/curve/editfont.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_file/filesel.c | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 868c5902670..2be567e1921 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -381,19 +381,19 @@ static int paste_file(bContext *C, ReportList *reports, char *filename) 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); diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index 9b335b86163..5466a06550b 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -1107,7 +1107,7 @@ static int file_browse_invoke(bContext *C, wmOperator *op, wmEvent *event) 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); diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index a0787ef989d..e9e09d8f60b 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -117,8 +117,6 @@ short ED_fileselect_set_params(SpaceFile *sfile) 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; |