Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-06-01 18:08:38 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-06-01 18:08:38 +0300
commit051e186d5c61dccfc776b8da9b83c598421be4e7 (patch)
tree8f00c5a6262ca522fcd11a8540aee637a5aa8245 /source/blender/editors/io
parent7c75c2db4f97e192d76761afe0cdb4391bdc0ec1 (diff)
Cleanup: some more G.main removal from editor code.
Diffstat (limited to 'source/blender/editors/io')
-rw-r--r--source/blender/editors/io/io_collada.c6
1 files changed, 4 insertions, 2 deletions
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;