diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 05:39:57 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 05:39:57 +0400 |
commit | 705f23064e8ba3e96690d163c98687fc79d4a179 (patch) | |
tree | 13251a1f24cfb219a62c4f64c6750cadec7ff712 /source/blender/editors/mesh/mesh_data.c | |
parent | 9e59fed5d8ff9f63477b3a73d2b02eaa55abd6cd (diff) | |
parent | dbdd1c2ea7496546f4f7e17350720a6005cdb187 (diff) |
svn merge ^/trunk/blender -r43294:43338
Diffstat (limited to 'source/blender/editors/mesh/mesh_data.c')
-rw-r--r-- | source/blender/editors/mesh/mesh_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 8ba4bb15849..74e3e189f40 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -533,7 +533,7 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event) } /* check input variables */ - if(RNA_property_is_set(op->ptr, "filepath")) { + if(RNA_struct_property_is_set(op->ptr, "filepath")) { char path[FILE_MAX]; RNA_string_get(op->ptr, "filepath", path); |