[Bf-blender-cvs] [dbf48758d95] master: Fix T73681: Python exception adding Empty objects via `object_data_add` with "Enter Edit Mode" enabled

[Philipp Oeser]

Commit: dbf48758d956bb23ad6b07ab16c3d0dacb657ccd
Author: Philipp Oeser
Date:   Mon Feb 10 10:26:34 2020 +0100
Branches: master
https://developer.blender.org/rBdbf48758d956bb23ad6b07ab16c3d0dacb657ccd

Fix T73681: Python exception adding Empty objects via `object_data_add`
with "Enter Edit Mode" enabled

It is valild to add Empties this way, but we cannot enter editmode on
those.

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

M	release/scripts/modules/bpy_extras/object_utils.py

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

diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py
index 8c009a77d3d..540bc75cece 100644
--- a/release/scripts/modules/bpy_extras/object_utils.py
+++ b/release/scripts/modules/bpy_extras/object_utils.py
@@ -161,7 +161,7 @@ def object_data_add(context, obdata, operator=None, name=None):
         bpy.ops.object.mode_set(mode='EDIT')
     else:
         layer.objects.active = obj_new
-        if context.preferences.edit.use_enter_edit_mode:
+        if obdata and context.preferences.edit.use_enter_edit_mode:
             bpy.ops.object.mode_set(mode='EDIT')
 
     return obj_new