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

WIP: Basic Blender Project Support (experimental feature) #107655

Draft
Julian Eisel wants to merge 94 commits from blender-projects-basics into main
pull from: blender-projects-basics
merge into: blender:main

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

2
source/blender/editors/asset/intern/asset_list.cc
View File

@ -162,7 +162,7 @@ void AssetList::setup()
BLI_path_is_rel(custom_library->path)) {
BlenderProject *project = CTX_wm_project();
const char *project_root_path = BKE_project_root_path_get(project);
BLI_path_join(path, sizeof(path), project_root_path, custom_library->path, NULL);
BLI_path_join(path, sizeof(path), project_root_path, custom_library->path);
}
else {
BLI_strncpy(path, custom_library->path, sizeof(path));

7
source/blender/editors/space_file/filesel.c
View File

@ -436,11 +436,8 @@ static void fileselect_refresh_asset_params(FileAssetSelectParams *asset_params)
if (BLI_path_is_rel(custom_library->path)) {
const char *project_root_path = BKE_project_root_path_get(project);
BLI_path_join(base_params->dir,
sizeof(base_params->dir),
project_root_path,
custom_library->path,
NULL);
BLI_path_join(
base_params->dir, sizeof(base_params->dir), project_root_path, custom_library->path);
}
else {
BLI_strncpy(base_params->dir, custom_library->path, sizeof(base_params->dir));