Commit Graph

112 Commits

Author SHA1 Message Date
Richard Malo
0a9e1df30b UDataLayerEditorSubsystem now passes the DataLayerInstance when broadcasting the EDataLayerAction::Delete action.
#rb jeanfrancois.dube
#jira UE-155204
#preflight 6294a9276601713a4f75718a

[CL 20429857 by Richard Malo in ue5-main branch]
2022-05-30 07:29:56 -04:00
Leon Huang
19877e39c5 Fix for duplicate localization key warnings and missing localization defines/undefines in various files.
#rnx
#rb: Vincent.Gauthier
#jira: UE-151614
#preflight: 628fc4a98c23e52ef0fdfa7d

[CL 20384450 by Leon Huang in ue5-main branch]
2022-05-26 16:11:10 -04:00
Richard Malo
223c790fef ActorFolder Improvements :
- Optimized FFolder resolving to UActorFolder : now uses and maintains an acceleration table
- Favor creation of FFolder using ActorFolderGuid when available
- FFolder creation now always passes a Root Object to facilitate Root Object ptr resolving (even when it's the main world)
- Fixed Duplicate Hierarchy when using Actor Folders and target level is different
- Fixed copy/paste actor from Persistent to LevelInstance not loosing actor folder
- Fixed mark for delete of an Actor Folder that could generate duplicates
- Modified fix of duplicate Actor Folders in a level : instead of renaming duplicates, mark for delete all duplicates except one and redirect children to the one we keep

#jira UE-150566
#rb patrick.enfedaque, jeanfrancois.dube
#preflight 6284101f486700b561a555ff

[CL 20346124 by Richard Malo in ue5-main branch]
2022-05-24 06:58:06 -04:00
Richard Malo
4a2f9db058 Fixed rare crash in UDataLayerEditorSubsystem when loading another world partition map.
#rb philippe.deseve
#preflight 628561c1890768f0e93bbbcf
#rnx

[CL 20269417 by Richard Malo in ue5-main branch]
2022-05-18 18:02:22 -04:00
JeanFrancois Dube
285e40444b Data Layers: replaced FScopedDataLayerTransaction by FScopedTransaction.
#rb richard.malo
#preflight 62824179c57a894cf66e3541
#rnx

[CL 20222410 by JeanFrancois Dube in ue5-main branch]
2022-05-16 08:48:27 -04:00
JeanFrancois Dube
13ea13eb8f World Partition Editor Hash:
- Unbound octree now stores hierarchical editor cells instead of leaves, this greatly reduce the number of needed editor cells for very large worlds.
- Implemented loading regions support to replace editor cells loading, in preparation for bookmark regions.

Tested against a 2000KMx2000km world + various internal projects and demos.

#rb patrick.enfedaque, richard.malo
#preflight 628239b5cf7e4667a97e3fe0

[CL 20222133 by JeanFrancois Dube in ue5-main branch]
2022-05-16 08:08:40 -04:00
Richard Malo
bbfa7b024e Fixed static analysis
#jira UE-151771
#rb patrick.enfedaque
#preflight 627e48205d0fe3ffef3c57ac
#rnx

[CL 20180106 by Richard Malo in ue5-main branch]
2022-05-13 08:40:05 -04:00
Richard Malo
e2b73feab9 Fixed assert in UDataLayerEditorSubsystem happening in Simulate.
#rb patrick.enfedaque
#jira UE-151604
#preflight 627ba9630a5817c9d9428048

[CL 20137623 by Richard Malo in ue5-main branch]
2022-05-11 08:44:11 -04:00
richard malo
879c5c42c6 Added support of Data Layers inside Level Instances.
#rb jeanfrancois.dube, patrick.enfedaque, philippe.deseve
#jira UE-151266
#preflight 62796854a35fb5cb3f55e9e6

#ROBOMERGE-OWNER: richard.malo
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 20121141 via CL 20121608 via CL 20121618
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20122781 by richard malo in ue5-main branch]
2022-05-10 10:22:54 -04:00
lauren barnes
4b82e918fa Replacing legacy EditorStyle calls with AppStyle
#rb header and class name replacement

#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20078276 via CL 20078825
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20106316 by lauren barnes in ue5-main branch]
2022-05-09 13:51:26 -04:00
lauren barnes
5f7006fb53 Fixing EditorStyle->AppStyle merge errors
#rb trivial

#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20073150 via CL 20073151
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20105751 by lauren barnes in ue5-main branch]
2022-05-09 13:31:58 -04:00
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
vincent beauchemin
ca3f1f20f9 DataLayer - Fix Duplicated keys for localization
#jira UE-150820 - UE5/Release-5.1 - Duplicated keys for localization - UE - LD & Art
#rb phiippel.deseve
#preflight skip
#rnx

[CL 20075312 by vincent beauchemin in ue5-main branch]
2022-05-06 10:22:04 -04:00
philippe deseve
ed0f48629d DataLayer API to go through DataLayerSubsystem instead of AWorlDataLayers
Move DataLayers' EditorWorldSetting logic from DataLayerEditorSubsystem & WorldDataLayers to DataLayerSubsystem
Use DataLayerInstance::GetOuterWorldDataLayers instead of retrieving the WorldDataLayers from UWorld::GetWorldDataLayers instead
Rename UDataLayerSubsystem::GetDataLayerFromAsset to GetDataLayerInstanceFromAsset to be inline with the rest of the API
Preparation for multiple AWorldDataLayers existing in the same world

#rb richard.malo
#test PIE, SIE, -game, Editing flow, cooked game, Hlods generation
#preflight 627402a0ca0ad32a968422af

#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-SOURCE: CL 20060072 via CL 20060595 via CL 20060607
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20062765 by philippe deseve in ue5-main branch]
2022-05-05 15:15:33 -04:00
philippe deseve
b2cec0d0d0 Use WorldPartitionRuntimeCell data layers whenever possible when retrieving data layers for an actor
Remove check in DataLayerHierarchy that the world need to be teared down when removing actors. Callback occurs when unloading cells.

#rb jeanfrancois.dube
#test PIE, SIE, Game
#preflight 62729fce2f6d177be3c5f198

#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-SOURCE: CL 20042858 via CL 20042862 via CL 20042869
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20044831 by philippe deseve in ue5-main branch]
2022-05-04 14:05:46 -04:00
philippe deseve
5491b76a38 Fix a crash occuring when editing a Gameplay Effect
Restrict the usage of retrieving an actor's DataLayerInstanace via it's cell to PIE/SIE and -game in editor builds.
Fix potential crash when trying to retrieve DataLayerInstances of an actor in non-worldpartition world

#test PIE, SIE, -game, cooked game, FN editing
#jira UE-150868
#rb richard.malo

#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-SOURCE: CL 20024307 via CL 20024321 via CL 20024344
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20025859 by philippe deseve in ue5-main branch]
2022-05-03 10:53:21 -04:00
Richard Malo
dffb5b9557 Second pass on Editor Context
#jira UE-150705
#rb patrick.enfedaque
#preflight 626fe655645c64f3a2426e06

[CL 20008791 by Richard Malo in ue5-main branch]
2022-05-02 11:00:12 -04:00
philippe deseve
78493fe4f3 Serialize a reference from a ULevel to its corresponding WorldPartitionCell when its a level streamed from a WorldPartition grid.
Allow actors to retrieve their DataLayers outside of editor builds.
Actors now use their cell to retrieve their DataLayers when possible (i.e. when GenerateStreaming was done and the grid is built.)
Removed UActors::GetDataLayerInstances(AWorldDataLayers). Function isn't needed anymore as it was an overload called by the UI and problematic when exiting PIE. Actors on DataLayers not longer had their owning world set and the WOrldDataLayer was inaccessible. No longer need to use the WorldDataLayer as we use the Cell to get the Datalayers in PIE.

#test Editor, PIE, SIE, Cook, Cooked Game, -game
#jira UE-147731
#preflight 626be5d32660750c3ffaf757

#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-SOURCE: CL 19977670 via CL 19977902 via CL 19978142
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 19985780 by philippe deseve in ue5-main branch]
2022-04-29 17:03:39 -04:00
philippe deseve
d05121f9b1 Undo 19721428
Access to WorldSubsystems at cook time are causing crashes

#rb richard.malo
#jira UE-148953 UE-148946
#preflight 62572be3d606fd159e9e67e0

#ROBOMERGE-OWNER: zousar.shaker
#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-COMMAND: _robomerge[bot4] UE5-MAIN
#ROBOMERGE-SOURCE: CL 19745482 via CL 19747379 via CL 19747391
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v938-19570697)

[CL 19751374 by philippe deseve in ue5-main branch]
2022-04-14 00:26:55 -04:00
Philippe DeSeve
d7fd705427 Move DataLayerInstanceName resolving to UDataLayerSubsystem from UDataLayerEditorSubsystem.
UDataLayerEditorSubsystem is not initialized when lauching with "-game"

#rb richard.malo
#preflight 6256dfab2b4502493e794c9c

[CL 19739997 by Philippe DeSeve in ue5-main branch]
2022-04-13 10:51:55 -04:00
philippe deseve
83be8e37a1 DataLayer API to go through DataLayerSubsystem instead of AWorlDataLayers
Move DataLayers' EditorWorldSetting logic from DataLayerEditorSubsystem & WorldDataLayers to DataLayerSubsystem
Use DataLayerInstance::GetOuterWorldDataLayers instead of retrieving the WorldDataLayers from UWorld::GetWorldDataLayers instead
Rename UDataLayerSubsystem::GetDataLayerFromAsset to GetDataLayerInstanceFromAsset to be inline with the rest of the API
Preparation for multiple AWorldDataLayers existing in the same world

#rb richard.malo
#preflight 6255924fcd5ed4dd0916d8e5

#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-SOURCE: CL 19721428 via CL 19721841 via CL 19722491
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v938-19570697)

[CL 19725557 by philippe deseve in ue5-main branch]
2022-04-12 14:08:25 -04:00
JeanFrancois Dube
678fba0c18 Data Layers: added engine bridge for editor callbacks.
#rb richard.malo
#preflight 624b0800927e60e341952989
#rnx

[CL 19613276 by JeanFrancois Dube in ue5-main branch]
2022-04-04 15:00:42 -04:00
richard malo
0a2a437037 Changed SelectedDataLayersFromEditorSelection to be rebuilt only when necessary.
#rb jeanfrancois.dube
#preflight 624ae8b1e434babd8a3060b0

#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 19608028 via CL 19608074 via CL 19608126
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v938-19570697)

[CL 19609192 by richard malo in ue5-main branch]
2022-04-04 10:57:17 -04:00
philippe deseve
ddc4fd70e3 AWorldDataLayers::Create no longer sets the UWorld::WorldDataLayers.
Pass an optional name to AWorldDataLayer::Create
Remove UDataLayerEditorSubsystem::GetWorldDataLayers(bool). UWorld::WorldDataLayers are always created now.
Preparation for multiple AWorldDataLayers within a single world

#rb richard.malo
#preflight 624702e8927e60e34176d184

#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-SOURCE: CL 19587841 via CL 19587883 via CL 19587899
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v938-19570697)

[CL 19589001 by philippe deseve in ue5-main branch]
2022-04-01 11:15:33 -04:00
Dominic Couture
e09ebc1632 -Unregister context menu when FDataLayerMode is destroyed since the context menu uses lambdas that capture the FDataLayerMode instance and doesn't get recreated unless unregistered.
#jira UE-147799
#rb philippe.deseve
#preflight 62470cb9df7d23dbfe1b9976

[CL 19588610 by Dominic Couture in ue5-main branch]
2022-04-01 10:54:07 -04:00