[Bf-blender-cvs] [dacbcde446b] blender-projects-basics: Merge branch 'master' into blender-projects-basics

[Julian Eisel]

Commit: dacbcde446b00de61347deeb45aefe17f7dcf128
Author: Julian Eisel
Date:   Mon Oct 17 22:36:47 2022 +0200
Branches: blender-projects-basics
https://developer.blender.org/rBdacbcde446b00de61347deeb45aefe17f7dcf128

Merge branch 'master' into blender-projects-basics

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/preferences.c
index 095f69e15ea,dd76f9eddc1..fa894529f97
--- a/source/blender/blenkernel/intern/preferences.c
+++ b/source/blender/blenkernel/intern/preferences.c
@@@ -30,12 -111,11 +30,11 @@@ void BKE_preferences_custom_asset_libra
      return;
    }
  
 -  bUserAssetLibrary *library = BKE_preferences_asset_library_add(
 -      userdef, DATA_(BKE_PREFS_ASSET_LIBRARY_DEFAULT_NAME), NULL);
 +  CustomAssetLibraryDefinition *library = BKE_asset_library_custom_add(
 +      &userdef->asset_libraries, DATA_(BKE_PREFS_ASSET_LIBRARY_DEFAULT_NAME), NULL);
  
    /* Add new "Default" library under '[doc_path]/Blender/Assets'. */
-   BLI_path_join(
-       library->path, sizeof(library->path), documents_path, N_("Blender"), N_("Assets"), NULL);
+   BLI_path_join(library->path, sizeof(library->path), documents_path, N_("Blender"), N_("Assets"));
  }
  
  /** \} */