[Bf-extensions-cvs] [2ffb3576] blender-v2.82-release: Merge remote-tracking branch 'origin/blender-v2.81-release' into blender-v2.82-release

[Dalai Felinto]

Commit: 2ffb35765e88fa190ad2c8ca7ff01ebc74ed5837
Author: Dalai Felinto
Date:   Mon Jan 13 13:26:35 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBA2ffb35765e88fa190ad2c8ca7ff01ebc74ed5837

Merge remote-tracking branch 'origin/blender-v2.81-release' into blender-v2.82-release

This was neglected in the 2.81 development cycle, so master didn't
include some commits when we created this branch.

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



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

diff --cc io_mesh_stl/blender_utils.py
index 8589e196,63f0c4f2..97621d11
--- a/io_mesh_stl/blender_utils.py
+++ b/io_mesh_stl/blender_utils.py
@@@ -77,10 -77,9 +77,11 @@@ def faces_from_mesh(ob, global_matrix, 
          Split the quad into two triangles
      """
  
 +    import bpy
 +
      # get the editmode data
-     ob.update_from_editmode()
+     if ob.mode == "EDIT":
+         ob.update_from_editmode()
  
      # get the modifiers
      if use_mesh_modifiers: