archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

LibOverride: Abstract a bit handling of local items of RNA collections.

Browse Source 
RNA collections that support insertion of new items in liboverride
data-block need a special way to distiguish between locale and
orig-from-linked items (since some operations are allowed on the forer,
but no the latter).

In future we want a proper solution to abstract that at the
`BKE_lib_override` level, but for now we need to add some code for each
case.

Note that this commit also fixes a few potential issues with GPencil
modifiers, and constraints, regarding their handling of local overrides.
This commit is contained in:
Bastien Montagne
2020-12-07 16:52:45 +01:00
parent 513578b182
commit bab57550b6
9 changed files with 74 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/object/object_modifier.c
View File

@@ -1052,11 +1052,9 @@ bool edit_modifier_poll_generic(bContext *C,
return false;
}
if (ID_IS_OVERRIDE_LIBRARY(ob) && !is_liboverride_allowed) {
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;
}
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");
return false;
}
if (!is_editmode_allowed && CTX_data_edit_object(C) != NULL) {