diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-08-03 17:24:34 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-08-03 17:24:34 +0300 |
| commit | f24920790d4e88475949cfaceee66f536c293e3d (patch) | |
| tree | 6e6fec9b9300c429a7d51835f72e754553f93f35 /source/blender/editors/object/object_modifier.c | |
| parent | a44299ccd11759363a18f623f7070c4e2febe33f (diff) | |
| parent | 473d9507fa73a17970be325c8f797bbf6654aab4 (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/editors/object/object_modifier.c')
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 00c588f7a17..517e791e8fa 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1347,7 +1347,7 @@ static bool modifier_apply_poll_ex(bContext *C, bool allow_shared) Object *ob = (ptr.owner_id != NULL) ? (Object *)ptr.owner_id : ED_object_active_context(C); ModifierData *md = ptr.data; /* May be NULL. */ - if (ID_IS_OVERRIDE_LIBRARY(ob) || ID_IS_OVERRIDE_LIBRARY(ob->data)) { + if (ID_IS_OVERRIDE_LIBRARY(ob) || ((ob->data != NULL) && ID_IS_OVERRIDE_LIBRARY(ob->data))) { CTX_wm_operator_poll_msg_set(C, "Modifiers cannot be applied on override data"); return false; } |