blender
/
blender
134
399
Fork 582
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 352 commits from brush-assets-project into main
pull from: brush-assets-project
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 6 Commits 352 Files Changed 124 +9 -1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e9588e5175 - Show all commits

10
source/blender/blenkernel/intern/main.cc
View File

@ -980,7 +980,15 @@ Main *BKE_main_from_id(Main *global_main, const ID *id, const bool verify)
}
else {
/* Debug assert, especially for places that pass in G_MAIN. */
BLI_assert(BLI_findindex(which_libbase(global_main, GS(id->name)), id) != -1);
#ifndef NDEBUG
if (id->flag & LIB_EMBEDDED_DATA) {
const ID *id_owner = BKE_id_owner_get(const_cast<ID*>(id));
BLI_assert(BLI_findindex(which_libbase(global_main, GS(id_owner->name)), id_owner) != -1);
}
else {
BLI_assert(BLI_findindex(which_libbase(global_main, GS(id->name)), id) != -1);
}
#endif
}
return global_main;