Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-04-30 13:50:08 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-04-30 13:50:08 +0300
commita79b09e7622bbbfbfe5a1f1998dc5c2976a7d57b (patch)
tree6344ad3b245e9eac9adfd686602824da373b5bae /source/blender/editors/object/object_modifier.c
parent7f208be9297d23891b278c4a33b93992a4d76b20 (diff)
parentf4d5a69cf8512aafcc697d1b09f65489015b6af4 (diff)
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/editors/object/object_modifier.c')
-rw-r--r--source/blender/editors/object/object_modifier.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 0d896f14888..38d027b3676 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1051,6 +1051,10 @@ bool edit_modifier_poll_generic(bContext *C,
return false;
}
+ if (!mod) {
+ return false;
+ }
+
if (!is_liboverride_allowed && BKE_modifier_is_nonlocal_in_liboverride(ob, mod)) {
CTX_wm_operator_poll_msg_set(
C, "Cannot edit modifiers coming from linked data in a library override");