dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BKE: id_delete: Do not forbid layer collection resync in non-Main case.

Browse Source 
There is no reason to deal with layer collections resync in non-main
case, deletion code should never trigger it anyway.

This will avoid quite a lot of the non-main-thread calls to
`BKE_layer_collection_resync_forbid` (detected and 'fixed' in previous
commit).
This commit is contained in:
Bastien Montagne
2024-07-17 10:33:12 +02:00
parent 087aea876d
commit adf990f5e1
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/blenkernel/intern/lib_id_delete.cc
+13 -6
View File
@@ -172,18 +172,25 @@ static int id_free(Main *bmain, void *idv, int flag, const bool use_flag_from_id
return flag;
}
void BKE_id_free_ex(Main *bmain, void *idv, int flag, const bool use_flag_from_idtag)
void BKE_id_free_ex(Main *bmain, void *idv, const int flag_orig, const bool use_flag_from_idtag)
{
/* ViewLayer resync needs to be delayed during Scene freeing, since internal relationships
* between the Scene's master collection and its view_layers become invalid
* (due to remapping). */
BKE_layer_collection_resync_forbid();
if (bmain && (flag_orig & LIB_ID_FREE_NO_MAIN) == 0) {
BKE_layer_collection_resync_forbid();
}
flag = id_free(bmain, idv, flag, use_flag_from_idtag);
int flag_final = id_free(bmain, idv, flag_orig, use_flag_from_idtag);
BKE_layer_collection_resync_allow();
if (bmain && (flag & LIB_ID_FREE_NO_MAIN) == 0) {
BKE_main_collection_sync_remap(bmain);
if (bmain) {
if ((flag_orig & LIB_ID_FREE_NO_MAIN) == 0) {
BKE_layer_collection_resync_allow();
}
if ((flag_final & LIB_ID_FREE_NO_MAIN) == 0) {
BKE_main_collection_sync_remap(bmain);
}
}
}