[Bf-blender-cvs] [2649927c9df] asset-browser-poselib: Merge branch 'master' into asset-browser-poselib
Julian Eisel
noreply at git.blender.org
Sun Jun 13 22:24:26 CEST 2021
Commit: 2649927c9df81cc894699bf785c589b7e51f8caa
Author: Julian Eisel
Date: Sun Jun 13 22:13:00 2021 +0200
Branches: asset-browser-poselib
https://developer.blender.org/rB2649927c9df81cc894699bf785c589b7e51f8caa
Merge branch 'master' into asset-browser-poselib
===================================================================
===================================================================
diff --cc source/blender/editors/space_file/filesel.c
index 844e15e0bb6,8e3fc36aa71..f2bd7e37ae4
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@@ -119,8 -118,9 +119,9 @@@ static void fileselect_ensure_updated_a
asset_params = sfile->asset_params = MEM_callocN(sizeof(*asset_params),
"FileAssetSelectParams");
asset_params->base_params.details_flags = U_default.file_space_data.details_flags;
- asset_params->asset_library.type = FILE_ASSET_LIBRARY_LOCAL;
+ asset_params->asset_library.type = ASSET_LIBRARY_LOCAL;
asset_params->asset_library.custom_library_index = -1;
+ asset_params->import_type = FILE_ASSET_IMPORT_APPEND;
}
FileSelectParams *base_params = &asset_params->base_params;
More information about the Bf-blender-cvs
mailing list