[Bf-blender-cvs] [4a59ba4bc2b] soc-2020-io-performance: Fix crash: exporting object from Edit mode.

[Ankit Meel]

Commit: 4a59ba4bc2b573adcfe8fb27440bc282d52ad5fb
Author: Ankit Meel
Date:   Mon Jun 15 23:26:03 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB4a59ba4bc2b573adcfe8fb27440bc282d52ad5fb

Fix crash: exporting object from Edit mode.

===================================================================

M	source/blender/io/wavefront_obj/intern/wavefront_obj.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc

===================================================================

diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
index 718d26a0366..4fc4abca46d 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
@@ -36,7 +36,7 @@ void OBJ_export(bContext *C, const OBJExportParams *export_params)
   std::chrono::steady_clock::time_point begin = std::chrono::steady_clock::now();
   io::obj::exporter_main(C, export_params);
   std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();
-  std::cout << "-------- \n Time difference = "
+  std::cout << "--------\nExport Time = "
             << std::chrono::duration_cast<std::chrono::milliseconds>(end - begin).count() << "[ms]"
             << std::endl;
 }
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
index 2c1c246fa51..b76f40f3cbf 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
@@ -41,6 +41,7 @@
 #include "DNA_layer_types.h"
 #include "DNA_scene_types.h"
 
+#include "ED_object.h"
 #include "IO_wavefront_obj.h"
 
 #include "wavefront_obj.hh"
@@ -233,6 +234,7 @@ static void export_frame(bContext *C, const OBJExportParams *export_params, cons
  */
 void exporter_main(bContext *C, const OBJExportParams *export_params)
 {
+  ED_object_editmode_exit(C, EM_FREEDATA);
   Scene *scene = CTX_data_scene(C);
   const char *filepath = export_params->filepath;