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_node/node_edit.c | |
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_node/node_edit.c')
-rw-r--r-- | source/blender/editors/space_node/node_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 97e2eba7b64..dd838a67afa 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -2244,10 +2244,10 @@ static int node_add_file_exec(bContext *C, wmOperator *op) int ntype=0; /* check input variables */ - if (RNA_property_is_set(op->ptr, "path")) + if (RNA_property_is_set(op->ptr, "filepath")) { char path[FILE_MAX]; - RNA_string_get(op->ptr, "path", path); + RNA_string_get(op->ptr, "filepath", path); ima= BKE_add_image_file(path, scene ? scene->r.cfra : 1); } else if(RNA_property_is_set(op->ptr, "name")) @@ -2291,7 +2291,7 @@ static int node_add_file_invoke(bContext *C, wmOperator *op, wmEvent *event) UI_view2d_region_to_view(&ar->v2d, event->x - ar->winrct.xmin, event->y - ar->winrct.ymin, &snode->mx, &snode->my); - if (RNA_property_is_set(op->ptr, "path") || RNA_property_is_set(op->ptr, "name")) + if (RNA_property_is_set(op->ptr, "filepath") || RNA_property_is_set(op->ptr, "name")) return node_add_file_exec(C, op); else return WM_operator_filesel(C, op, event); |