3 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index e684ad03f53..dd015f59e8d 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -706,8 +706,9 @@ static bool edit_constraint_poll_generic(bContext *C,
     return false;
   }
 
-  if (!is_liboverride_allowed && !BKE_constraint_is_local_in_liboverride(ob, con)) {
-    CTX_wm_operator_poll_msg_set(C, "Cannot edit constraints coming from library override");
+  if (!is_liboverride_allowed && BKE_constraint_is_nonlocal_in_liboverride(ob, con)) {
+    CTX_wm_operator_poll_msg_set(
+        C, "Cannot edit constraints coming from linked data in a library override");
     return false;
   }
 
diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c
index d3f165678c3..af95f5581bd 100644
--- a/source/blender/editors/object/object_gpencil_modifier.c
+++ b/source/blender/editors/object/object_gpencil_modifier.c
@@ -443,9 +443,9 @@ static bool gpencil_edit_modifier_poll_generic(bContext *C,
     return false;
   }
 
-  if (!is_liboverride_allowed &&
-      (mod == NULL || !BKE_gpencil_modifier_is_local_in_liboverride(ob, mod))) {
-    CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers coming from library override");
+  if (!is_liboverride_allowed && BKE_gpencil_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");
     return false;
   }
 
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index bb4581b0ee8..3111003703f 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1052,8 +1052,9 @@ bool edit_modifier_poll_generic(bContext *C,
     return false;
   }
 
-  if (!is_liboverride_allowed && !BKE_modifier_is_local_in_liboverride(ob, mod)) {
-    CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers coming from library override");
+  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");
     return false;
   }