Commit Graph

212 Commits

Author SHA1 Message Date
aurel cordonnier
d17d20ca36 Merge from Release-Engine-Test @ 16758890 to UE5/Main
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719 (and Release-17.00 @ 16658211)

[CL 16763350 by aurel cordonnier in ue5-main branch]
2021-06-23 17:51:32 -04:00
jamie dale
8e5e147425 Fixed some places leaving lingering element references from selection
#jira UE-116919
#rb Francis.Hurteau, Brooke.Hubert
#lockdown Simon.Tourangeau
#preflight 60c00edab68c70000182639c

#ROBOMERGE-SOURCE: CL 16599146 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v828-16531559)

[CL 16599171 by jamie dale in ue5-main branch]
2021-06-08 21:21:42 -04:00
jason walter
ae933b9eb9 Add a deprecation warning when using the ConcertVersion flag.
#jira ue-105016
#rb none

[CL 16538819 by jason walter in ue5-main branch]
2021-06-02 16:23:47 -04:00
jason walter
861cd668e5 Add command line flag for enabling additional concert logging.
#rb matt.johnson
#jira uetool-3570

[CL 16537699 by jason walter in ue5-main branch]
2021-06-02 15:01:25 -04:00
aurel cordonnier
43fa62fcd8 Merge from Release-Engine-Test @ 16487383 to UE5/Main
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40:37 -04:00
Steve Robb
ba5a9cb362 Some explicit casts to UTF8CHAR, for upcoming changes to that type.
#rb none
#jira none

[CL 16478979 by Steve Robb in ue5-main branch]
2021-05-26 20:27:50 -04:00
Patrick Boutot
aeea5f0679 Slate: Convert SConcertScrollBox, SWrapBox, SBoxPanel, SWindow FSlot's to the FSlotArgument syntax.
#jira UE-114425
#preflight 60adb0b704188d000133d0b9

[CL 16466544 by Patrick Boutot in ue5-main branch]
2021-05-26 06:42:00 -04:00
Francis Hurteau
d78428d58d Identify the Concert Package Bridge Handle Asset Added save as a "from autosave" save for now to distinguish it from normal user save in the editor
#rb Jason.Walter, Jamie.Dale
#jira UE-115567
#preflight 60a7eda01d78490001390e90

[CL 16422356 by Francis Hurteau in ue5-main branch]
2021-05-21 14:48:38 -04:00
aurel cordonnier
8eebe8841f Merge UE5/RET @ 16305968 to UE5/Main
This represents UE4/Main @ 16261013 and Dev-PerfTest @ 16259937

[CL 16306996 by aurel cordonnier in ue5-main branch]
2021-05-12 18:10:03 -04:00
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
Andriy Tylychko
32a2fc989e cleaning up the previous change to FThreadStats::StopThread() that caused it to be called twice, and crashing on the second call as TaskGraph was already shut down
many programs were calling FThreadStats::StopThread() and FTaskGraphInterfaces::Shutdown() explicitly despite they are called from FEngineLoop::AppExit(). Calling them twice is problematic because FThreadStats::StopThread() expects TaskGraph to be still alive. This didn't cause any visible problems before because FThreadStats::StopThread() wasn't called in AppExit().

#rb ionut.matasaru

[CL 16127968 by Andriy Tylychko in ue5-main branch]
2021-04-27 11:09:21 -04:00
Jamie Dale
4afb7ce6bb Made EName an enum class to prevent implicit conversion to int
The following code would call the int overload rather than the name overload when passed an EName constant, which could easily lead to confusion and bugs:
    using FMyId = uint8;
    void DoThing(FName);
    void DoThing(FMyId);
    DoThing(NAME_Actor);

The change to use enum class requires that any code that actually deals with EName as an int (mostly internal name code and serialisation) be updated to explicitly cast, but prevents the implicit conversion that causes the issue above.

In order to preserve the NAME_X aliases that the old-style enum added to the global scope, new aliases have been added that point to the EName scoped versions. Unfortunately these can cause shadowing warnings if NAME_X is defined in the local scope, as the old-style enum used to allow that without shadowing, however there is no way to prevent this so we'll just need to fix any warnings that occur.

#rb Johan.Torp
#preflight 6087e06349a9840001414708

[CL 16126708 by Jamie Dale in ue5-main branch]
2021-04-27 10:11:18 -04:00
mark lintott
bd61859350 #jira 112822
#rb johan.torp
Removal of UE4 references in Archive.h

[CL 16002350 by mark lintott in ue5-main branch]
2021-04-14 05:14:13 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
louise rasmussen
af40e9cac5 Level Editor Menu Clean Up, Part 2
#JIRA UETOOL-3039
#rb Lauren.Barnes
#lockdown Simon.Tourangeau
#preflight 606d2c11dc3e5b0001c915aa

#ROBOMERGE-OWNER: louise.rasmussen
#ROBOMERGE-AUTHOR: louise.rasmussen
#ROBOMERGE-SOURCE: CL 15937971 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
#ROBOMERGE-CONFLICT from-shelf

[CL 15938452 by louise rasmussen in ue5-main branch]
2021-04-07 02:56:12 -04:00
louise rasmussen
825c64a6f5 Level Editor Menu Re-org, Part 1
#JIRA UETOOL-3039
#rb Lauren.Barnes
#lockdown Simon.Tourangeau
#preflight 606b8e0315d4190001b1698b

#ROBOMERGE-SOURCE: CL 15924633 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15924652 by louise rasmussen in ue5-main branch]
2021-04-05 19:11:24 -04:00
jason walter
1fbad9224f Clean-up UE4 names in Concert
#rb none
#jira ue-111041

#ushell-cherrypick of 15805294 by jason.walter

#ROBOMERGE-SOURCE: CL 15915565 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15919234 by jason walter in ue5-main branch]
2021-04-05 13:28:56 -04:00
max chen
8958dacab7 Sequencer: Initialize SequencerState time to the InSequencer time if the state doesn't exist in OnSequencerCreated. Remove the SequencerState on close if the session doesn't exist. This fixes a bug where Sequencer should initialize the current playback time to the lower bound of the playback range.
#jira UE-112470
#rb francis.hurteau

#ROBOMERGE-OWNER: max.chen
#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 15892129 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
#ROBOMERGE-CONFLICT from-shelf

[CL 15892230 by max chen in ue5-main branch]
2021-04-01 14:05:06 -04:00
Matt Peters
c6a0834e2e Change PreSave functions to use IsProceduralChange or IsCooking instead of GIsCookerLoadingPackage so that the extra steps are not taken in EditorDomain saves.
#rb Devin.Doucette
#rnx

[CL 15877209 by Matt Peters in ue5-main branch]
2021-03-31 12:44:41 -04:00
mark lintott
24420693b6 #jira UE-111195
Updated references to UE4 to Unreal in NetworkFileConnection.cpp
This required references to GPackageFileUE4Version and GPackageFileLicenseeUE4Version to also be updated to GPackageFileUnrealVersion and GPackageFileLicenseeUnrealVersion accordingly

#ROBOMERGE-SOURCE: CL 15850452 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15851651 by mark lintott in ue5-main branch]
2021-03-29 11:38:01 -04:00
Matt Peters
fd97028c28 Change presave prototype to take an FObjectSaveContextRef to provide more information about the save parameters.
#rb Francis.Hurteau, Devin.Doucette
#rn Minor Cooking

[CL 15831839 by Matt Peters in ue5-main branch]
2021-03-25 16:51:36 -04:00
Patrick Boutot
190e76913f Deprecate non-const binding function in TAttribute. TAttribute::Steal now returns an inplace TVariant, before an ObjectType was created by the default constructor.
#rb steve.robb
#preflight 605b46b6e8944a0001cf35a7

[CL 15798959 by Patrick Boutot in ue5-main branch]
2021-03-24 10:43:43 -04:00
Marc Audy
0cbbc781ca Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
This represents UE4/Main @ 15709114

[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
jason walter
71c3991b42 Initialize test variables to 0.
#rb none
#jira ue-110805

[CL 15737239 by jason walter in ue5-main branch]
2021-03-18 09:13:34 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00