Commit Graph

21 Commits

Author SHA1 Message Date
jeanmichel dignard
e8b6562802 Datasmith UE5 merge fix: Made FDatasmithUniqueNameProviderBase copyable and movable
#rb Johan.Duparc, Julien.StJean
#preflight 61b1307c643ecfe8b07e7d92

#ROBOMERGE-AUTHOR: jeanmichel.dignard
#ROBOMERGE-SOURCE: CL 18413666 in //UE5/Release-5.0/... via CL 18413678
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v897-18405271)

[CL 18413692 by jeanmichel dignard in ue5-release-engine-test branch]
2021-12-08 17:36:52 -05:00
emil kirichev
1fda9a16c6 Datasmith GLTF importer: Add support for PBR-Next materials
#jira UETOOL-3908
#rb JeanLuc.Corenthin

#ROBOMERGE-AUTHOR: emil.kirichev
#ROBOMERGE-SOURCE: CL 18404698 in //UE5/Release-5.0/... via CL 18404701
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v896-18170469)

[CL 18404706 by emil kirichev in ue5-release-engine-test branch]
2021-12-08 07:34:46 -05:00
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
johan duparc
745ad9d412 Datasmith: Animation frames data (type FDatasmithTransformFrameInfo) made compatible with LargeWorldCoordinates
#rb JeanLuc.Corenthin, Anousack.Kitisa

#ROBOMERGE-AUTHOR: johan.duparc
#ROBOMERGE-SOURCE: CL 17476382 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17476383 by johan duparc in ue5-release-engine-test branch]
2021-09-09 16:59:14 -04:00
emil kirichev
8feefc5231 glTF Importer: Add support for PBR-Next materials
#jira UEENT-4558
#rb JeanLuc.Corenthin

#ROBOMERGE-SOURCE: CL 17400551 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17400558 by emil kirichev in ue5-release-engine-test branch]
2021-09-02 06:33:05 -04:00
johan duparc
1f102c7750 Datasmith: cleanup unused Displacement mapping code
#jira UE-113727
#rb Jean-Luc.Corenthin

#ROBOMERGE-SOURCE: CL 17205136 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17205150 by johan duparc in ue5-release-engine-test branch]
2021-08-17 16:24:05 -04:00
aurel cordonnier
02c0f425e8 Copy up from Release-Engine-Staging @ 16738359
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719

[CL 16738582 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-22 00:27:54 -04:00
Marc Audy
e80ea6b959 Merge from Release-Engine-Staging @ 16444985
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16445122 by Marc Audy in ue5-release-engine-test branch]
2021-05-25 02:43:26 -04:00
johan duparc
7f92044224 Github PR#8044: Added clear cloat and subsurface shading models to datasmith importer
#jira UE-115980
#rb JeanLuc.Corenthin
#rnx

#ROBOMERGE-SOURCE: CL 16418166 in //UE4/Release-4.27/... via CL 16418197
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v811-16416015)

[CL 16419056 by johan duparc in ue5-release-engine-staging branch]
2021-05-21 10:49:27 -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
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
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -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
JeanMichel Dignard
9f7e63cdb6 Updated Datasmith Texture Importer to use the Interchange Framework
- Datasmith will only wait on the texture import result when it needs it for another asset (ie: material).
- Added a custom texture pipeline to set the datasmith attributes on the texture node.
- Created a FAsyncResult that behaves like a TFuture but calling Get will actually tick the task graph so that we don't deadlock when trying to get the future from the game thread while it depends on a game thread task.

#rb alexis.matte, richard.talbotwatkin

[CL 14228303 by JeanMichel Dignard in ue5-main branch]
2020-09-01 11:46:40 -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
david lesage
29c49218fe Merging 11284724 //UE4/Dev-Enterprise to Release-4.25 (//UE4/Release-4.25)
CoreTechFileParser improvement : converting as soon as possible void* into TArray<Vector>, ...
#rb johan.duparc
#jira UE-88554

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

[CL 11501208 by david lesage in 4.25-Plus branch]
2020-02-18 11:20:44 -05:00
JeanMichel Dignard
84facd6d15 Copy from dev-enterprise cl 11097196
#rb none
#rnx

[CL 11099277 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-23 16:28:59 -05:00