diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-01 18:26:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-01 18:26:36 +0300 |
| commit | e44743736f39246192b49912073a96b4a5cdd2ee (patch) | |
| tree | d01a6c42376d9dbfc3f58965289e10be20def4ee /source/blender/editors/io | |
| parent | e4a727626e34eef20e2b41cc3e26b41db4f360a0 (diff) | |
| parent | 051e186d5c61dccfc776b8da9b83c598421be4e7 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_internal.c
source/blender/makesrna/intern/rna_object_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/editors/io')
| -rw-r--r-- | source/blender/editors/io/io_collada.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index a3cbdb57fed..7fe252309de 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -164,8 +164,10 @@ 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)); Scene *scene = CTX_data_scene(C); |