blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Merge branch 'blender-v2.90-release'

This commit is contained in:
Bastien Montagne 2020-07-27 10:26:00 +02:00
parent 40a9524637 d906116eba
commit 93e6ed9b45
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenkernel/intern/lib_override.c
View File

@ -394,7 +394,8 @@ static bool lib_override_hierarchy_recursive_tag(Main *bmain, ID *id, const uint
}
/**
* Tag all IDs in given \a bmain that use (depends on) given \a id_root ID.
* Tag all IDs in given \a bmain that are being used by given \a id_root ID or its dependencies,
* recursively.
*
* This will include all local IDs, and all IDs from the same library as the \a id_root.
*
@ -1167,7 +1168,7 @@ void BKE_lib_override_library_main_operations_create(Main *bmain, const bool for
static bool lib_override_library_id_reset_do(Main *bmain, ID *id_root)
{
bool was_property_deleted = false;
bool was_op_deleted = false;
LISTBASE_FOREACH_MUTABLE (
IDOverrideLibraryProperty *, op, &id_root->override_library->properties) {
@ -1208,18 +1209,18 @@ static bool lib_override_library_id_reset_do(Main *bmain, ID *id_root)
if (do_op_delete) {
BKE_lib_override_library_property_delete(id_root->override_library, op);
was_property_deleted = true;
was_op_deleted = true;
}
}
if (was_property_deleted) {
if (was_op_deleted) {
DEG_id_tag_update_ex(bmain, id_root, ID_RECALC_COPY_ON_WRITE);
IDOverrideLibraryRuntime *override_runtime = override_library_rna_path_runtime_ensure(
id_root->override_library);
override_runtime->tag |= IDOVERRIDE_LIBRARY_RUNTIME_TAG_NEEDS_RELOAD;
}
return was_property_deleted;
return was_op_deleted;
}
/** Reset all overrides in given \a id_root, while preserving ID relations. */