[Bf-extensions-cvs] [4aa080a1] master: A.N.T. Landscape: prevent entering editmode

[Philipp Oeser]

Commit: 4aa080a1c338177ade30534f5d4ba20423446a8d
Author: Philipp Oeser
Date:   Mon Mar 18 12:44:06 2019 +0100
Branches: master
https://developer.blender.org/rBA4aa080a1c338177ade30534f5d4ba20423446a8d

A.N.T. Landscape: prevent entering editmode

This addon is designed to work in objectmode and this has already
(partially) been taken care of (see rBA87579bd164c6 / T53624).

However, this could still run into errors when the 'Enter Edit mode'
preference was ON, so disable that while adding a landscape object (and
restore afterwards)

Fixes T54954

Reviewers: brecht

Maniphest Tasks: T54954

Differential Revision: https://developer.blender.org/D4539

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

M	ant_landscape/add_mesh_ant_landscape.py

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

diff --git a/ant_landscape/add_mesh_ant_landscape.py b/ant_landscape/add_mesh_ant_landscape.py
index 28f89da7..bb2173d0 100644
--- a/ant_landscape/add_mesh_ant_landscape.py
+++ b/ant_landscape/add_mesh_ant_landscape.py
@@ -597,6 +597,10 @@ class AntAddLandscape(bpy.types.Operator):
         undo = bpy.context.preferences.edit.use_global_undo
         bpy.context.preferences.edit.use_global_undo = False
 
+        # turn off 'Enter Edit Mode'
+        use_enter_edit_mode = bpy.context.preferences.edit.use_enter_edit_mode
+        bpy.context.preferences.edit.use_enter_edit_mode = False
+
         # deselect all objects when in object mode
         if bpy.ops.object.select_all.poll():
             bpy.ops.object.select_all(action='DESELECT')
@@ -778,7 +782,8 @@ class AntAddLandscape(bpy.types.Operator):
         if self.auto_refresh is False:
             self.refresh = False
 
-        # restore pre operator undo state
+        # restore pre operator state
         context.preferences.edit.use_global_undo = undo
+        bpy.context.preferences.edit.use_enter_edit_mode = use_enter_edit_mode
 
         return {'FINISHED'}