Commit Graph

13 Commits

Author SHA1 Message Date
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
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
brooke hubert
48113fc77e Adding EditorFramework to build.cs files
#rnx
#Jira UE-96448
#rb chris.gagnon

[CL 14114839 by brooke hubert in ue5-main branch]
2020-08-14 13:24:16 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
anousack kitisa
4efc0a9a22 Fixed crash with GeometryCacheAbcFile after leaving PIE and reloading Alembic.
#jira UE-89784

#rb Julien.StJean

#ROBOMERGE-SOURCE: CL 11868444 in //UE4/Release-4.25/... via CL 11868467
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11870145 by anousack kitisa in Main branch]
2020-03-03 11:45:40 -05:00
anousack kitisa
19556db9c1 Fixed crash with GeometryCacheAbcFile after leaving PIE and reloading Alembic.
#jira UE-89784

#ROBOMERGE-SOURCE: CL 11866915 in //UE4/Release-4.25/... via CL 11866916
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11870126 by anousack kitisa in Main branch]
2020-03-03 11:45:35 -05:00
jurre debaare
7f6ef3c07b CIS shadow-variable fix
#jira none
#rb none

#ROBOMERGE-SOURCE: CL 11823667 in //UE4/Release-4.25/... via CL 11823669
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11823673 by jurre debaare in Main branch]
2020-03-02 09:22:37 -05:00
anousack kitisa
ba2c8d92e0 Copied 11443501 from Dev-VirtualProduction.
Added support for materials for GeometryCacheAbcFile.

#jira UEENT-3383

#rb Jurre.deBaare

#ROBOMERGE-SOURCE: CL 11462530 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11462534 by anousack kitisa in 4.25-Plus branch]
2020-02-17 14:27:19 -05:00
anousack kitisa
8483143982 Copied 11392843 from Dev-VirtualProduction.
Fixed crash with GeometryCacheAbcFile when trying to load files that don't have any visible geometry or that are made of elements other than triangles and quads.

#jira UE-88382

#rb Julien.StJean

#ROBOMERGE-SOURCE: CL 11462089 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11462094 by anousack kitisa in 4.25-Plus branch]
2020-02-17 14:13:56 -05:00
anousack kitisa
dea6fe9726 Copied 11307851 from Dev-VirtualProduction.
Fixed crash in PIE with an empty GeometryCacheAbcFile actor in the level.
Fixed crash when clearing the Alembic File Path on the GeometryCacheAbcFile component.

#jira UE-88384

#rb none

#ROBOMERGE-SOURCE: CL 11461755 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11461758 by anousack kitisa in 4.25-Plus branch]
2020-02-17 13:45:28 -05:00
anousack kitisa
df2c4d62a5 Copied 11303546 from Dev-VirtualProduction.
Added actor factory for GeometryCacheAbcFile.

#jira UEENT-3381

#rb none

#ROBOMERGE-SOURCE: CL 11461606 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11461620 by anousack kitisa in 4.25-Plus branch]
2020-02-17 13:39:23 -05:00
anousack kitisa
b8116f0098 Copied 11294374 from Dev-VirtualProduction.
Added Alembic settings to GeometryCacheAbcFileComponent.

#jira UEENT-3380

#rb Julien.StJean

#ROBOMERGE-SOURCE: CL 11460423 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11460424 by anousack kitisa in 4.25-Plus branch]
2020-02-17 11:41:57 -05:00
Anousack Kitisa
5bc89f7cf7 Copied CL 11188915 from //UE4/Dev-VirtualProduction.
GeometryCache from Alembic file without importing. (Fixed for Mac build)

#rb Jurre.deBaare
#rb Johan.Duparc

[CL 11207881 by Anousack Kitisa in Dev-Tools-Staging branch]
2020-02-03 13:29:44 -05:00