diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-08-12 12:13:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-08-12 12:13:10 +0300 |
| commit | 05cb4cf26ea728b6c83c410cd986784f9fbf878f (patch) | |
| tree | 9bc2cea66ecfff270ff4192e812fa8a80984aaf8 /source/blender/editors/object/object_modifier.c | |
| parent | 00a7113e613c51c07ea1630b12748fad1b9b57d0 (diff) | |
| parent | d070d33aa3bf0cdc3f6656e46476b75b367cd482 (diff) | |
Merge branch 'blender-v2.90-release' into master
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 8d6d2e3e31d..749034acd85 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1022,7 +1022,7 @@ bool edit_modifier_poll_generic(bContext *C, } if (ID_IS_OVERRIDE_LIBRARY(ob)) { - if ((mod != NULL) && (mod->flag & eModifierFlag_OverrideLibrary_Local) == 0) { + if ((mod == NULL) || (mod->flag & eModifierFlag_OverrideLibrary_Local) == 0) { CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers coming from library override"); return false; } |