diff options
author | Bastien Montagne <bastien@blender.org> | 2020-07-27 11:26:00 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-07-27 11:26:00 +0300 |
commit | 93e6ed9b451de20bec9e65e9908cc07d8b25fd21 (patch) | |
tree | b6671effa62003668c74b1b9c4fd3f74ac8753cf /source/blender/blenkernel | |
parent | 40a9524637908ff80cf8a0d99853b2ee6636a5fe (diff) | |
parent | d906116eba70e40900f53f5a53fcdfb4d4b7b834 (diff) |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/lib_override.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index 2a5782a5509..2989c910c45 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -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. */ |