diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:04:04 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:04:04 +0300 |
| commit | 16100f8261770e367b0892bb38c778699ed609fe (patch) | |
| tree | 97232730f4680cd689cfa086c5434761c7dd33c7 /source/blender/windowmanager | |
| parent | b53d358261a26652d510d62565f1b43035a55e67 (diff) | |
Cleanup: get rid of last G.main usages in BKE library code.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files_link.c | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index fb611290aa5..79f47d0c4f8 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -539,7 +539,7 @@ static int wm_lib_relocate_invoke(bContext *C, wmOperator *op, const wmEvent *UN char lib_name[MAX_NAME]; RNA_string_get(op->ptr, "library", lib_name); - lib = (Library *)BKE_libblock_find_name_ex(CTX_data_main(C), ID_LI, lib_name); + lib = (Library *)BKE_libblock_find_name(CTX_data_main(C), ID_LI, lib_name); if (lib) { if (lib->parent) { @@ -784,7 +784,7 @@ static int wm_lib_relocate_exec_do(bContext *C, wmOperator *op, bool do_reload) char lib_name[MAX_NAME]; RNA_string_get(op->ptr, "library", lib_name); - lib = (Library *)BKE_libblock_find_name_ex(CTX_data_main(C), ID_LI, lib_name); + lib = (Library *)BKE_libblock_find_name(CTX_data_main(C), ID_LI, lib_name); if (lib) { Main *bmain = CTX_data_main(C); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index f46358f83cf..5c500cf04c1 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1306,6 +1306,7 @@ wmOperator *WM_operator_last_redo(const bContext *C) */ ID *WM_operator_drop_load_path(struct bContext *C, wmOperator *op, const short idcode) { + Main *bmain = CTX_data_main(C); ID *id = NULL; /* check input variables */ if (RNA_struct_property_is_set(op->ptr, "filepath")) { @@ -1333,8 +1334,6 @@ ID *WM_operator_drop_load_path(struct bContext *C, wmOperator *op, const short i if (is_relative_path ) { if (exists == false) { - Main *bmain = CTX_data_main(C); - if (idcode == ID_IM) { BLI_path_rel(((Image *)id)->name, bmain->name); } @@ -1347,7 +1346,7 @@ ID *WM_operator_drop_load_path(struct bContext *C, wmOperator *op, const short i else if (RNA_struct_property_is_set(op->ptr, "name")) { char name[MAX_ID_NAME - 2]; RNA_string_get(op->ptr, "name", name); - id = BKE_libblock_find_name(idcode, name); + id = BKE_libblock_find_name(bmain, idcode, name); if (!id) { BKE_reportf(op->reports, RPT_ERROR, "%s '%s' not found", BKE_idcode_to_name(idcode), name); |