diff options
| author | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
| commit | 7246c387435769a169ac24c91434c615df6434b4 (patch) | |
| tree | 61842e3e0ce85e80720fdd7476d44d2e629f59fd /release/scripts/modules/bpy_extras/object_utils.py | |
| parent | c5f55d17096d373791363e46004176e3f7f7ae52 (diff) | |
| parent | 0b4bd3ddc016298e868169a541cf6c132b10c587 (diff) | |
Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view
Diffstat (limited to 'release/scripts/modules/bpy_extras/object_utils.py')
| -rw-r--r-- | release/scripts/modules/bpy_extras/object_utils.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py index ab678ba27c8..5275a83e062 100644 --- a/release/scripts/modules/bpy_extras/object_utils.py +++ b/release/scripts/modules/bpy_extras/object_utils.py @@ -142,8 +142,17 @@ def object_data_add(context, obdata, operator=None, name=None): bpy.ops.object.mode_set(mode='EDIT') else: layer.objects.active = obj_new - if obdata and context.preferences.edit.use_enter_edit_mode: - bpy.ops.object.mode_set(mode='EDIT') + if context.preferences.edit.use_enter_edit_mode: + if obdata and obdata.library is None: + obtype = obj_new.type + mode = None + if obtype in {'ARMATURE', 'CURVE', 'CURVES', 'FONT', 'LATTICE', 'MESH', 'META', 'SURFACE'}: + mode = 'EDIT' + elif obtype == 'GPENCIL': + mode = 'EDIT_GPENCIL' + + if mode is not None: + bpy.ops.object.mode_set(mode=mode) return obj_new |