blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

UI: Asset Shelf (Experimental Feature) #104831

Closed
Julian Eisel wants to merge 399 commits from asset-shelf into main
pull from: asset-shelf
merge into: blender:main

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

4
source/blender/editors/asset/intern/asset_shelf_settings.cc
View File

@ -40,7 +40,9 @@ AssetShelfSettings &AssetShelfSettings::operator=(const AssetShelfSettings &othe
next = prev = nullptr;
active_catalog_path = BLI_strdup(other.active_catalog_path);
if (active_catalog_path) {
JulianEisel marked this conversation as resolved Outdated
Campbell Barton commented 2023-07-20 13:31:10 +02:00
Outdated
Review
Copy Link

This can be null (noted in doc-string), crashes when duplicating an empty 3D view.

This can be null (noted in doc-string), crashes when duplicating an empty 3D view.
active_catalog_path = BLI_strdup(other.active_catalog_path);
}
BLI_listbase_clear(&enabled_catalog_paths);
LISTBASE_FOREACH (LinkData *, catalog_path_item, &other.enabled_catalog_paths) {