Commit Graph

10 Commits

Author SHA1 Message Date
marc audy
1763e57c6c HLOD with imposter section not assign to the correct material ID, and the proxy material is added for each imposter section.
#jira UE-70972
#rb none
#lockdown nick.penwarden
[FYI] Alexis.Matte

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 6190448 in //UE4/Release-4.22/... via CL 6317275
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6349828 by marc audy in Dev-VR branch]
2019-05-07 17:30:34 -04:00
alexis matte
0e0151d95e HLOD with imposter get the imposter section not assign to the correct material ID, and the proxy material is added for each imposter section.
The jira I put here must be re-tested since I change the fix for it.
#jira UE-70972
[FYI] johan.duparc

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 6023508 via CL 6023509 via CL 6024040 via CL 6024213
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6028353 by alexis matte in Dev-VR branch]
2019-04-19 21:17:57 -04:00
Ryan Vance
35eb0041ab Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 5387703 by Ryan Vance in Dev-VR branch]
2019-03-13 15:19:08 -04:00
Ryan Vance
7c51ff94af Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
CL 1 of 8
#rb integration

[CL 4748712 by Ryan Vance in Dev-VR branch]
2019-01-17 18:54:05 -05:00
Marc Audy
d90da4ab1a Merge to Dev-Main for 4.20 @ 4090813
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4091081 by Marc Audy in Main branch]
2018-05-23 21:04:31 -04:00
Matt Kuhlenschmidt
238fcb9d83 Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry)
#fyi richard.talbotwatkin, alexis.matte

#rb none

[CL 3928841 by Matt Kuhlenschmidt in Dev-Geometry branch]
2018-03-06 13:26:20 -05:00
Alexis Matte
1119758fae Change Meshdescription to use FName instead of indexes.
#rb none

[CL 3924913 by Alexis Matte in Dev-Geometry branch]
2018-03-05 10:06:09 -05:00
Matt Kuhlenschmidt
68f4525e1b Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry)
#rb none

[CL 3889612 by Matt Kuhlenschmidt in Dev-Geometry branch]
2018-02-14 14:13:42 -05:00
Alexis Matte
aa84947dfc Make the mesh description conversion from/to rawmesh
Move triangulation from editable mesh to MeshDescription
Fix the edge creation when importing a fbx to mesh description
Add automation tests for mesh description, add some conversion tests
Load orion monolith02 level succesfully using meshdescription instead of rawmesh

#rb none

[CL 3817088 by Alexis Matte in Dev-Geometry branch]
2017-12-28 17:15:00 -05:00
Mike Fricker
3892ace583 Merging //UE4/Dev-Main to Dev-Geometry (//UE4/Dev-Geometry) (up to CL 3517493)
#rb none

[CL 3517961 by Mike Fricker in Dev-Geometry branch]
2017-06-30 12:21:06 -04:00