diff --git a/source/blender/blenkernel/intern/preferences.cc b/source/blender/blenkernel/intern/preferences.cc index 08f89b55962..b6e83bc466c 100644 --- a/source/blender/blenkernel/intern/preferences.cc +++ b/source/blender/blenkernel/intern/preferences.cc @@ -63,7 +63,9 @@ bUserAssetLibrary *BKE_preferences_asset_library_add(UserDef *userdef, bUserAssetLibrary *library = DNA_struct_default_alloc(bUserAssetLibrary); BLI_addtail(&userdef->asset_libraries, library); - + if (userdef->experimental.no_data_block_packing) { + library->import_method = ASSET_IMPORT_APPEND_REUSE; + } if (name) { BKE_preferences_asset_library_name_set(userdef, library, name); } diff --git a/source/blender/makesdna/DNA_userdef_defaults.h b/source/blender/makesdna/DNA_userdef_defaults.h index d38fe584817..4b44fb07128 100644 --- a/source/blender/makesdna/DNA_userdef_defaults.h +++ b/source/blender/makesdna/DNA_userdef_defaults.h @@ -18,7 +18,7 @@ #define _DNA_DEFAULT_bUserAssetLibrary \ { \ - .import_method = ASSET_IMPORT_APPEND_REUSE, \ + .import_method = ASSET_IMPORT_PACK, \ .flag = ASSET_LIBRARY_RELATIVE_PATH, \ } diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index d010c6045fb..21fe29efd8f 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -1541,6 +1541,11 @@ static const EnumPropertyItem *rna_preference_asset_libray_import_method_itemf( return items; } +int rna_preference_asset_libray_import_method_default(PointerRNA * /*ptr*/, PropertyRNA * /*prop*/) +{ + return U.experimental.no_data_block_packing ? ASSET_IMPORT_APPEND_REUSE : ASSET_IMPORT_PACK; +} + static void rna_experimental_no_data_block_packing_update(bContext *C, PointerRNA *ptr) { Main *bmain = CTX_data_main(C); @@ -6750,6 +6755,7 @@ static void rna_def_userdef_filepaths_asset_library(BlenderRNA *brna) RNA_def_property_enum_items(prop, rna_enum_preferences_asset_import_method_items); RNA_def_property_enum_funcs( prop, nullptr, nullptr, "rna_preference_asset_libray_import_method_itemf"); + RNA_def_property_enum_default_func(prop, "rna_preference_asset_libray_import_method_default"); RNA_def_property_ui_text( prop, "Default Import Method",