Merge branch 'blender-v4.0-release'

This commit is contained in:
Bastien Montagne
2023-10-31 11:57:00 +01:00

View File

@@ -3619,8 +3619,11 @@ void BKE_lib_override_library_make_local(Main *bmain, ID *id)
}
/* In case a liboverride hierarchy root is 'made local', i.e. is not a liboverride anymore, all
* hierarchy roots of all liboverrides need to be validated/re-generated again. */
BKE_lib_override_library_main_hierarchy_root_ensure(bmain);
* hierarchy roots of all liboverrides need to be validated/re-generated again.
* Only in case `bmain` is given, otherwise caller is responsible to do this. */
if (bmain) {
BKE_lib_override_library_main_hierarchy_root_ensure(bmain);
}
}
/* We only build override GHash on request. */