Commit Graph

6 Commits

Author SHA1 Message Date
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
ryan durand
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -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
Andrew Rodham
f6a7943f68 Sequencer: Fixed key structs not working correctly for object channel keys
- Until recently object path channels had key values of type TSoftObjectPtr<UObject>, but this was changed to be a struct type that contained both a soft object ptr and a strong reference in order to correctly support asnc loads (by hinting the async loader that each asset referenced by the channel was required before the package load completes).
  - This caused a disparity between the key data type and the type of the generated key struct being used to edit it.
  - A new PostConstructKeyInstance function can now be overloaded to provide additional behavior on instantiation of a new key struct which is used here to assign the UObject* to the key value correctly usding its overloaded assignment operator.

#rb Max.Chen

[CL 5386586 by Andrew Rodham in Dev-Sequencer branch]
2019-03-13 14:28:47 -04:00
Max Chen
edcab9950f Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 4664858 by Max Chen in Dev-Sequencer branch]
2018-12-15 23:56:00 -05:00
Ben Marsh
ea340d3fbf Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4567513 by Ben Marsh in Main branch]
2018-11-14 19:05:13 -05:00