diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-05-07 03:54:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-05-07 03:54:52 +0300 |
| commit | 78b2b5fc0e3063656ace8d37f18a8873f6ef06e6 (patch) | |
| tree | bcebe026ba93b143d7cd352de14cccd1975344fd /source/blender/editors/object | |
| parent | 72cefdfd592148eebf99cb0259a6ce1912731434 (diff) | |
| parent | 7b9c865afc6107e52696eebb22586a19ae54d554 (diff) | |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 07c8e7725e3..d3b4b91881c 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1590,12 +1590,9 @@ static const EnumPropertyItem *object_mode_set_itemsf(bContext *C, return rna_enum_object_mode_items; } - Object *ob = CTX_data_active_object(C); + const Object *ob = CTX_data_active_object(C); if (ob) { - const bool use_mode_particle_edit = (BLI_listbase_is_empty(&ob->particlesystem) == false) || - (ob->soft != NULL) || - (BKE_modifiers_findby_type(ob, eModifierType_Cloth) != - NULL); + const bool use_mode_particle_edit = ED_object_particle_edit_mode_supported(ob); while (input->identifier) { if ((input->value == OB_MODE_EDIT && OB_TYPE_SUPPORT_EDITMODE(ob->type)) || (input->value == OB_MODE_POSE && (ob->type == OB_ARMATURE)) || |