Commit Graph

3 Commits

Author SHA1 Message Date
Alejandro Arango
85d83b1ee9 nDisplay,TextureShare: Merge from RES.
#rb
#jira
#rnx

[CL 17223255 by Alejandro Arango in ue5-main branch]
2021-08-18 17:46:21 -04:00
Vitalii Boiko
e5d2313a79 nDisplay: Fixed TextureSharing regression
#jira UE-120154
#author Peter.Tarasenko
#rb Vitalii Boiko

#ROBOMERGE-SOURCE: CL 17053492 in //UE4/Release-4.27/... via CL 17053535
#ROBOMERGE-BOT: RELEASE (Release-4.27-Chaos -> Main) (v850-17047176)

#ushell-cherrypick of 17053559 by vitalii.boiko

[CL 17056918 by Vitalii Boiko in ue5-main branch]
2021-08-04 14:56:23 -04:00
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00