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

[Julian Eisel]

Commit: 7158e0eb4cfa32f49527f660f73031207bc8f8be
Author: Julian Eisel
Date:   Wed Nov 2 11:58:03 2022 +0100
Branches: blender-projects-basics
https://developer.blender.org/rB7158e0eb4cfa32f49527f660f73031207bc8f8be

Merge branch 'master' into blender-projects-basics

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



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

diff --cc source/blender/blenkernel/intern/asset_library.cc
index 543b71e9da8,b8420af1168..6a667d572a0
--- a/source/blender/blenkernel/intern/asset_library.cc
+++ b/source/blender/blenkernel/intern/asset_library.cc
@@@ -7,9 -7,10 +7,10 @@@
  #include <memory>
  
  #include "BKE_asset_library.hh"
 +#include "BKE_asset_library_custom.h"
  #include "BKE_main.h"
 -#include "BKE_preferences.h"
  
+ #include "BLI_fileops.h"
  #include "BLI_path_util.h"
  
  #include "DNA_asset_types.h"
diff --cc source/blender/makesrna/intern/rna_asset.c
index a04fdbae465,3c7eb3d208f..7fbb6926cf1
--- a/source/blender/makesrna/intern/rna_asset.c
+++ b/source/blender/makesrna/intern/rna_asset.c
@@@ -554,8 -503,8 +560,9 @@@ void RNA_def_asset(BlenderRNA *brna
    rna_def_asset_tag(brna);
    rna_def_asset_data(brna);
    rna_def_asset_library_reference(brna);
 +  rna_def_asset_library_reference_custom(brna);
    rna_def_asset_handle(brna);
+   rna_def_asset_catalog_path(brna);
  
    RNA_define_animate_sdna(true);
  }