From 051e186d5c61dccfc776b8da9b83c598421be4e7 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 1 Jun 2018 17:08:38 +0200 Subject: Cleanup: some more G.main removal from editor code. --- source/blender/editors/io/io_collada.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/io') diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 42c19c6bc65..7e69aa62896 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -163,10 +163,12 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) limit_precision = RNA_boolean_get(op->ptr, "limit_precision"); keep_bind_info = RNA_boolean_get(op->ptr, "keep_bind_info"); + Main *bmain = CTX_data_main(C); + /* get editmode results */ - ED_object_editmode_load(CTX_data_edit_object(C)); + ED_object_editmode_load(bmain, CTX_data_edit_object(C)); - EvaluationContext *eval_ctx = G.main->eval_ctx; + EvaluationContext *eval_ctx = bmain->eval_ctx; Scene *scene = CTX_data_scene(C); ExportSettings export_settings; -- cgit v1.2.3