blender
/
blender
134
399
Fork 582
Code Issues 6.2k 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 -17
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 23f0914744 - Show all commits

4
source/blender/editors/asset/ED_asset_handle.h
View File

@ -43,10 +43,6 @@ void ED_asset_handle_get_full_library_path(
/* `1024` for #FILE_MAX,
* rely on warnings to let us know if this gets out of sync. */
char r_full_lib_path[1024]);
void ED_asset_handle_get_full_path(const AssetHandle *asset_handle,
/* `1024 + 66` for #FILE_MAX_LIBEXTRA,
* rely on warnings to let us know if this gets out of sync. */
char r_full_lib_path[1024 + 66]);
#ifdef __cplusplus
}

13
source/blender/editors/asset/intern/asset_handle.cc
View File

@ -57,16 +57,3 @@ void ED_asset_handle_get_full_library_path(const AssetHandle *asset_handle,
BLI_strncpy(r_full_lib_path, library_path.c_str(), FILE_MAX);
}
void ED_asset_handle_get_full_path(const AssetHandle *asset_handle,
char r_full_lib_path[FILE_MAX_LIBEXTRA])
{
*r_full_lib_path = '\0';
std::string library_path = asset_handle->file_data->asset->get_identifier().full_path();
if (library_path.empty()) {
return;
}
BLI_strncpy(r_full_lib_path, library_path.c_str(), FILE_MAX);
}