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:
authorBastien Montagne <bastien@blender.org>2020-12-08 11:40:42 +0300
committerBastien Montagne <bastien@blender.org>2020-12-08 11:40:42 +0300
commit682ccd770c629402b771491d45a0523f75750f30 (patch)
treefb37b6966691426464e7dd01f1e5b2372895974b /source/blender/editors/object
parent5f1a155a5ef39a4db144b38a607c19b763f965a3 (diff)
LibOverride: Refactor collection items 'local' helper functions.
It's easier to read and less 'weird' to check that an item is non-local in a liboverride data-block, than the other way around. Thanks to @sybren for noticing it.
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_constraint.c5
-rw-r--r--source/blender/editors/object/object_gpencil_modifier.c6
-rw-r--r--source/blender/editors/object/object_modifier.c5
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;
}