diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-07-31 20:19:29 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-08-03 17:20:46 +0300 |
| commit | 473d9507fa73a17970be325c8f797bbf6654aab4 (patch) | |
| tree | 6f282d7e119ac25a7f018566a74064453e877f48 /source/blender/editors/object/object_modifier.c | |
| parent | 2bb73787791a1743d421d4b418ed3b635eb17ccd (diff) | |
Fix T78536: Crash calling object.modifier_apply on an empty
Caused by rB6add0cc88a0d.
Maniphest Tasks: T78536
Differential Revision: https://developer.blender.org/D8440
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 8a736c380bf..e93bd8bd94e 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; } |