Commit Graph

3 Commits

Author SHA1 Message Date
Matt Peters
7ad238a806 AssetRegistry includes (Engine/Source): change #include "AssetData.h" -> #include "AssetRegistry/AssetData.h", and similar for the other moved AssetRegistry headers.
#rb Zousar.Shaker
#rnx
#preflight 6270509a220f89f0ad573030

[CL 20016982 by Matt Peters in ue5-main branch]
2022-05-02 18:06:48 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
jamie dale
bbffdb8e81 Moved CollectionAssetManagement to AssetTools so it can be shared
#jira
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 13006995 via CL 13007016 via CL 13007026 via CL 13007030
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 13007036 by jamie dale in Main branch]
2020-04-23 10:44:49 -04:00