diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-06-14 07:52:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-14 07:52:10 +0400 |
commit | c2f36a4d6abf829f28079c80e7e9dae6b80251cc (patch) | |
tree | 0c85ad35fca0cadbb997a098244debab62a6167a /source/blender/editors/space_file | |
parent | aa97b4362be6015b3e7e1d5c72bd5245cfb0960a (diff) |
naming changes
path -> filepath (for rna and operators, as agreed on with elubie)
path -> data_path (for windowmanager context functions, this was alredy used in many places)
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r-- | source/blender/editors/space_file/file_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/file_panels.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/filesel.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index ccecbd61663..9028e5f15c6 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -576,7 +576,7 @@ int file_exec(bContext *C, wmOperator *exec_op) if(RNA_boolean_get(op->ptr, "relative_path")) BLI_path_rel(name, G.sce); - RNA_string_set(op->ptr, "path", name); + RNA_string_set(op->ptr, "filepath", name); /* some ops have multiple files to select */ { diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c index 637e56459d7..4a505bc022f 100644 --- a/source/blender/editors/space_file/file_panels.c +++ b/source/blender/editors/space_file/file_panels.c @@ -182,7 +182,7 @@ static void file_panel_operator(const bContext *C, Panel *pa) if(flag & PROP_HIDDEN) continue; - if(strcmp(RNA_property_identifier(prop), "path") == 0) + if(strcmp(RNA_property_identifier(prop), "filepath") == 0) continue; if(strcmp(RNA_property_identifier(prop), "directory") == 0) continue; diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index f971e18043c..abb3a6a7a35 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -127,8 +127,8 @@ short ED_fileselect_set_params(SpaceFile *sfile) else params->type = FILE_SPECIAL; - if (RNA_property_is_set(op->ptr, "path")) { - RNA_string_get(op->ptr, "path", name); + if (RNA_property_is_set(op->ptr, "filepath")) { + RNA_string_get(op->ptr, "filepath", name); if (params->type == FILE_LOADLIB) { BLI_strncpy(params->dir, name, sizeof(params->dir)); BLI_cleanup_dir(G.sce, params->dir); |