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 351 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 351 Files Changed 124 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 914ad994f2 - Show all commits

4
source/blender/blenkernel/intern/asset_weak_reference.cc
View File

@ -78,10 +78,10 @@ bool operator==(const AssetWeakReference &a, const AssetWeakReference &b)
if (a.asset_library_type != b.asset_library_type) {
return false;
}
if (!STREQ(a.asset_library_identifier, b.asset_library_identifier)) {
if (StringRef(a.asset_library_identifier) != StringRef(b.asset_library_identifier)) {
return false;
}
if (!STREQ(a.relative_asset_identifier, b.relative_asset_identifier)) {
if (StringRef(a.relative_asset_identifier) != StringRef(b.relative_asset_identifier)) {
return false;
}
return true;