diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-27 13:42:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-27 13:42:03 +0400 |
| commit | 75e570b2b71b6d655a71205345752993e1a1cc92 (patch) | |
| tree | 923f95b34586e9ff709ade309f9fd5060025c70b /source/blender/editors/space_info | |
| parent | cfb435e8a52f41bc495c9aa65bae99aaddab1ad7 (diff) | |
| parent | 99075b35ed3e5f42f4e652f68b9a5612b54c4cde (diff) | |
svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk
Diffstat (limited to 'source/blender/editors/space_info')
| -rw-r--r-- | source/blender/editors/space_info/info_ops.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index 2b3785e2810..deff1c77912 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -253,10 +253,12 @@ void FILE_OT_make_paths_absolute(wmOperatorType *ot) /********************* report missing files operator *********************/ -static int report_missing_files_exec(bContext *UNUSED(C), wmOperator *op) +static int report_missing_files_exec(bContext *C, wmOperator *op) { + Main *bmain= CTX_data_main(C); + /* run the missing file check */ - checkMissingFiles(G.main, op->reports); + checkMissingFiles(bmain, op->reports); return OPERATOR_FINISHED; } @@ -276,13 +278,12 @@ void FILE_OT_report_missing_files(wmOperatorType *ot) /********************* find missing files operator *********************/ -static int find_missing_files_exec(bContext *UNUSED(C), wmOperator *op) +static int find_missing_files_exec(bContext *C, wmOperator *op) { - char *path; - - path= RNA_string_get_alloc(op->ptr, "filepath", NULL, 0); - findMissingFiles(G.main, path); - MEM_freeN(path); + Main *bmain= CTX_data_main(C); + const char *searchpath= RNA_string_get_alloc(op->ptr, "filepath", NULL, 0); + findMissingFiles(bmain, searchpath, op->reports); + MEM_freeN((void *)searchpath); return OPERATOR_FINISHED; } |