Commit: 2ce7f02a06c76c6afec544e4a46b2438e68cdf32
Author: Julian Eisel
Date: Thu Feb 17 21:35:34 2022 +0100
Branches: asset-browser-grid-view
https://developer.blender.org/rB2ce7f02a06c76c6afec544e4a46b2438e68cdf32
Fix missing (re)load when changing asset libraries
Logic to compare asset library references was incorrect.
===================================================================
M source/blender/editors/asset/intern/asset_library_reference.cc
===================================================================
diff --git a/source/blender/editors/asset/intern/asset_library_reference.cc
b/source/blender/editors/asset/intern/asset_library_reference.cc
index 04f77821114..5096b9d653d 100644
--- a/source/blender/editors/asset/intern/asset_library_reference.cc
+++ b/source/blender/editors/asset/intern/asset_library_reference.cc
@@ -17,9 +17,9 @@
AssetLibraryReferenceWrapper::AssetLibraryReferenceWrapper(const AssetLibraryRef
bool operator==(const AssetLibraryReferenceWrapper &a, const
AssetLibraryReferenceWrapper &b)
{
- return (a.type == b.type) && (a.type == ASSET_LIBRARY_CUSTOM) ?
- (a.custom_library_index == b.custom_library_index) :
- true;
+ return (a.type == b.type) &&
+ ((a.type == ASSET_LIBRARY_CUSTOM) ? (a.custom_library_index ==
b.custom_library_index) :
+ true);
}
uint64_t AssetLibraryReferenceWrapper::hash() const
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
