blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 774 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 - +2 -20
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e8bd93685b - Show all commits

15
source/blender/asset_system/intern/asset_library_service.cc
View File

@ -310,8 +310,6 @@ std::string AssetLibraryService::normalize_asset_weak_reference_relative_asset_i
StringRefNull relative_asset_identifier = asset_reference.relative_asset_identifier;
size_t offset = rfind_blendfile_extension(asset_reference.relative_asset_identifier);
std::cout << offset << "\n";
uint64_t alt_group_len;
int64_t group_len;
if (offset != std::string::npos) {
@ -327,19 +325,10 @@ std::string AssetLibraryService::normalize_asset_weak_reference_relative_asset_i
offset = 0;
}
std::cout << offset << "\n";
alt_group_len = uint64_t(relative_asset_identifier.find(ALTSEP, int64_t(offset)));
group_len = int64_t(
std::min(uint64_t(relative_asset_identifier.find(SEP, int64_t(offset))), alt_group_len));
std::cout << offset << " " << group_len << "\n";
std::cout << relative_asset_identifier.find(SEP) << " " << alt_group_len << " ==> " << group_len
<< "\n";
std::cout << relative_asset_identifier << "\n";
std::cout << utils::normalize_path(relative_asset_identifier, size_t(group_len) + 1) << "\n";
return utils::normalize_path(relative_asset_identifier, size_t(group_len) + 1);
}
@ -363,10 +352,6 @@ std::string AssetLibraryService::resolve_asset_weak_reference_to_full_path(
normalize_asset_weak_reference_relative_asset_identifier(
asset_reference);
std::cout << library_path << "\n";
std::cout << normalize_asset_weak_reference_relative_asset_identifier(asset_reference) << "\n";
std::cout << normalized_full_path << "\n";
return normalized_full_path;
}

4
source/blender/asset_system/intern/asset_library_service.hh
View File

@ -80,8 +80,8 @@ class AssetLibraryService {
AssetLibrary *get_asset_library_all(const Main *bmain);
/**
* Return the position of the last blendfile extension in given path, or std::string::npos if
* not found. Works with both kind of path separators. */
* Return the start position of the last blendfile extension in given path, or std::string::npos
* if not found. Works with both kind of path separators. */
size_t rfind_blendfile_extension(StringRef path);
/**
* Return a normalized version of #AssetWeakReference.relative_asset_identifier.

3
source/blender/asset_system/tests/asset_representation_test.cc
View File

@ -115,9 +115,6 @@ TEST_F(AssetRepresentationTest,
"to\\an\\asset";
std::string resolved_path = service->resolve_asset_weak_reference_to_full_path(*weak_ref);
std::cout << expected_path << "\n";
std::cout << resolved_path << "\n";
EXPECT_EQ(BLI_path_cmp(resolved_path.c_str(), expected_path.c_str()), 0);
}