Commit Graph

69 Commits

Author SHA1 Message Date
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
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
patrick enfedaque
7599f90f04 Fixup Redirectors: Fix GCed Empty Packages crash (fix one other use case in FAssetRenameManager that I previously missed)
#jira UE-142999
#rb richard.malo
#preflight 621631920f71e491ccf76408
#lockdown aurel.cordonnier
#rnx


#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 19093419 via CL 19093997 via CL 19094653 via CL 19096144 via CL 19105377
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19146681 by patrick enfedaque in ue5-main branch]
2022-02-25 09:44:15 -05:00
michael noland
ab53a1b72e Split BP project settings out into a separate header
#jira UE-81056
#preflight 61dfb80df61ef33adf330a27

#ROBOMERGE-AUTHOR: michael.noland
#ROBOMERGE-SOURCE: CL 18594094 in //UE5/Release-5.0/... via CL 18594096 via CL 18594101
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Test -> Main) (v899-18417669)

[CL 18596566 by michael noland in ue5-main branch]
2022-01-13 10:03:20 -05:00
patrick enfedaque
e4b59af808 Fix crash because of GCed empty packages
#rb jeanfrancois.dube

#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 18430670 in //UE5/Release-5.0/... via CL 18435312
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v897-18405271)

[CL 18435544 by patrick enfedaque in ue5-release-engine-test branch]
2021-12-10 17:47:18 -05:00
julien stjean
3dbf2f5314 Making a rename that only change the case of an asset work properly.
It work only for the assets that aren't source controlled.

#jira UE-120816
#rb Jamie.Dale
#preflight 61a45606361aa0b85b158e5a

#ROBOMERGE-AUTHOR: julien.stjean
#ROBOMERGE-SOURCE: CL 18306364 in //UE5/Release-5.0/... via CL 18306382
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18306384 by julien stjean in ue5-release-engine-test branch]
2021-11-28 23:47:49 -05:00
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -04:00
jeanfrancois dube
18c51757df Optimize FAssetRenameDataWithReferencers by changing an array with a set.
Results for breaking a Level Instance with ~10K actors: ~810s down to ~256s.

#rb patrick.enfedaque


#ROBOMERGE-SOURCE: CL 16586087
#ROBOMERGE-BOT: (v828-16531559)

[CL 16586102 by jeanfrancois dube in ue5-main branch]
2021-06-08 08:49:20 -04:00
sebastien lussier
96cdb23b80 #jira UE-113757
Unstable crash on moving assets from one folder to another

Referencing packages & possibly their non RF_Standalone content were GC'd at the first GC pass, before they had the chance of being saved.
Made sure referencing packages are saved before a GC pass is done.

#ROBOMERGE-SOURCE: CL 16060766 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v789-15992632)

[CL 16064236 by sebastien lussier in ue5-main branch]
2021-04-20 14:35:25 -04:00
justin hare
5f1caca88c Fixed issue where renaming certain assets causes soft reference issues, with special handling for GameMapsSettings: ensure redirectors are created for assets that are soft-referenced by CDOs when they are renamed. Enhanced warning message at time of renaming if any GameMapsSettings are affected. Added error at cook time if any of the GameMapsSettings maps/modes are still pointing to redirectors, as they will fail to load at runtime.
#jira UE-80948

[CL 15475421 by justin hare in ue5-main branch]
2021-02-19 16:15:20 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
rex hill
782ebdba5f Fix source control errors during rename of file open for add
#jira UE-88886
#rb Dave.Belanger


#ROBOMERGE-SOURCE: CL 11548509 via CL 11548538 via CL 11548551
#ROBOMERGE-BOT: (v654-11333218)

[CL 11548562 by rex hill in Main branch]
2020-02-19 14:16:53 -05:00
robert manuszewski
b938e59c9b Reimplementing FProperty changes from //UE4/Main
+ Reimplemented FProperty related fixed from //UE4/Main:
CL#10791312, 10804850, 10851666, 10855122, 10855198, 10942138, 11030611, 11030639, 11032261, 11061515, 11136964,11138881, 11214238, 11214865

#rb none (previously reviewed in Dev-Core)
[FYI] Chris.Bunnner, Daniel.Lamb


#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 11302985 via CL 11303011 via CL 11303019
#ROBOMERGE-BOT: (v0-11244347)

[CL 11303183 by robert manuszewski in Main branch]
2020-02-10 08:06:56 -05:00
Jamie Dale
ddf3e630c8 Correctly update in-memory String Table asset references when a String Table asset is renamed
#jira UE-87884
#rb Lauren.Barnes

[CL 11199152 by Jamie Dale in Main branch]
2020-01-31 14:55:39 -05:00
dave belanger
3ef0eaeb01 Fast and lexical sort functors for FSoftObjectPath, FSoftObjectPtr, TSoftObjectPtr and TSoftClassPtr.
#rb Steve.Robb


#ROBOMERGE-SOURCE: CL 11163489 via CL 11163493 via CL 11163498
#ROBOMERGE-BOT: (v640-11091645)

[CL 11167146 by dave belanger in Main branch]
2020-01-29 15:33:21 -05:00
ryan durand
471d972e62 Updating copyright for Engine Developer.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870584 by ryan durand in Main branch]
2019-12-26 15:32:37 -05:00
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
Patrick Enfedaque
d62d1195c4 Editing LevelPartitionGrid: Edigrate from //dev-editor-openworld
Multiple engine changes needed to support LevelGrid

#rb jeanfrancois.dube, sebastien.lussier, richard.malo
#rnx


#ROBOMERGE-OWNER: Patrick.Enfedaque
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 10318590 via CL 10318595
#ROBOMERGE-BOT: (v593-10286020)

[CL 10318965 by Patrick Enfedaque in Main branch]
2019-11-20 09:47:23 -05:00
rex hill
1325b710fc Fix crash when deleting actor from level (follow up)
#jira UE-82895
[FYI] danny.couture
#rb none

#ROBOMERGE-SOURCE: CL 9961337 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v558-9892490)

[CL 9961343 by rex hill in Main branch]
2019-11-01 16:37:50 -04:00
rex hill
058a7f54df Fix crash when deleting actor from level
#jira UE-82895
#rb danny.couture

#ROBOMERGE-SOURCE: CL 9960569 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v558-9892490)

[CL 9960570 by rex hill in Main branch]
2019-11-01 14:51:23 -04:00