Commit Graph

41 Commits

Author SHA1 Message Date
chris gagnon
72ba51c5bd Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none


#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 6838042 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6874679 by chris gagnon in Dev-Build branch]
2019-06-07 05:27:42 -04:00
sebastien lussier
52b4c7db49 HLOD Imposters
* Now extracted from sub levels and brought in the main map to be rendered as instanced static meshes.
* Impostors meshes created during proxy creation.

#rb jeanfrancois.dube, jurre.debaare

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 6675359 via CL 6675861 via CL 6675880
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v364-6709755)

[CL 6716922 by sebastien lussier in Dev-Build branch]
2019-05-31 14:26:44 -04:00
alexis matte
2545947e63 Force automation process to not use the ddc when executing merge actor test for staticmesh
#rb jurre.debaare
#jira UE-72667

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 6476239 via CL 6476594 via CL 6476626
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6506418 by alexis matte in Dev-Build branch]
2019-05-15 15:16:38 -04:00
alexis matte
960e238e20 Tentative, fix crash when generating HLOD with impostor
#jira UE-73420
#rb none
#lockdown cristina.riveron

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 6256521 in //UE4/Release-4.22/... via CL 6317323
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6323486 by alexis matte in Dev-Build branch]
2019-05-06 17:11:12 -04:00
sebastien lussier
0cb5b2458c Merging negative-scaled actors breaks materials
#fix No need to reverse the section indices when a static mesh has a mirrored transform as TransformRawMeshVertexData() is now calling ReverseAllPolygonFacing() in this specific case
#jira UE-56953
#rb none
#lockdown cristina.riveron

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 6252335 in //UE4/Release-4.22/... via CL 6317322
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6323479 by sebastien lussier in Dev-Build branch]
2019-05-06 17:11:10 -04:00
marc audy
318f48de16 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: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 6190448 in //UE4/Release-4.22/... via CL 6317275
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6323322 by marc audy in Dev-Build branch]
2019-05-06 17:10:17 -04:00
jurre debaare
e172bb95f0 HLOD Emissive bakes have pink artifacts or other objects emissive planar mapped
#fix Make sure we retain Magenta pixels for emissive baked textures, and not apply emissive scaling to them to make sure they are masked out correctly when merging the different textures into the atlas
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6104752 via CL 6104754 via CL 6105018 via CL 6105094
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6127466 by jurre debaare in Dev-Build branch]
2019-04-26 22:18:47 -04:00
jurre debaare
787a4cc758 Z-fighting is observed throughout the map while skydiving from Battle bus in BR
#fix Added a flag for allowing two-sided materials for HLOD materials, enabled by default for backwards compatibility
[FYI] sebastien.lussier

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6076717 via CL 6076719 via CL 6077848 via CL 6078008
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6082460 by jurre debaare in Dev-Build branch]
2019-04-24 15:37:47 -04:00
alexis matte
c325d9440a 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: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 6023508 via CL 6023509 via CL 6024040 via CL 6024213
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6027384 by alexis matte in Dev-Build branch]
2019-04-19 21:11:59 -04:00
alexis matte
0a49173bbe Fix a material ID issue with HLOD, by sorting the section mapping
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5808584 via CL 5808586 via CL 5808587 via CL 5811617 via CL 5811867
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5841087 by alexis matte in Dev-Build branch]
2019-04-12 12:56:30 -04:00
alexis matte
ac57bad60a Need to Abs the X scale of the actor transform when generating imposter HLOD mesh.
#rb jurre.debaar

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5669391 via CL 5669393 via CL 5669505 via CL 5669539 via CL 5671569 via CL 5671746
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5673641 by alexis matte in Dev-Build branch]
2019-04-01 17:02:36 -04:00
alexis matte
2f7a39408b Fix material swap when merging imposter
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5669159 via CL 5669160 via CL 5669495 via CL 5669531 via CL 5671540 via CL 5671695
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5673556 by alexis matte in Dev-Build branch]
2019-04-01 17:02:20 -04:00
alexis matte
c73472c21c Make sure the imposter materials are assign properly when there is more then one different imposter in the HLOD.
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5659664 via CL 5659665 via CL 5659666 via CL 5659667 via CL 5659711 via CL 5659716
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5664918 by alexis matte in Dev-Build branch]
2019-04-01 09:11:41 -04:00
alexis matte
4fa6bf4f2b Fix the imposter mesh merge
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5659536 via CL 5659537 via CL 5659538 via CL 5659539 via CL 5659639 via CL 5659641
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5664878 by alexis matte in Dev-Build branch]
2019-04-01 09:11:32 -04:00
alexis matte
d23538157d Fix HLOD proxy build assert
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5639421 via CL 5639422 via CL 5639423 via CL 5639656 via CL 5640999 via CL 5647746
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5652582 by alexis matte in Dev-Build branch]
2019-03-29 17:01:09 -04:00
alexis matte
3555fedc47 fix from 4.22 cl:5317646
Fix MeshMergeUtilities when remapping polygon group
#jira UE-71016
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5518756 via CL 5518757 via CL 5518962 via CL 5535932
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5542608 by alexis matte in Dev-Build branch]
2019-03-25 17:13:33 -04:00
alexis matte
80cfce3294 Fix the GenerateUniqueUVsForStaticMesh when there is some duplicate polygon and we remove them, we must avoid Compacting the Polygon so the Remap VertexInstanceID is still valid.
There was a second crash after this one where the code did not call RegisterMeshAttribute on a newly created FMeshDescription.
#jira UE-71929
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 5504837 via CL 5504994 via CL 5517943 via CL 5535766
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5541225 by alexis matte in Dev-Build branch]
2019-03-25 17:08:26 -04:00
Ben Marsh
07e535411b Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 5435186 by Ben Marsh in Dev-Build branch]
2019-03-18 16:38:36 -04:00
Ben Marsh
43317388da Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4867651 by Ben Marsh in Dev-Build branch]
2019-02-01 11:34:13 -05:00
Ben Marsh
bbb8057a5e Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4820573 by Ben Marsh in Dev-Build branch]
2019-01-26 14:33:56 -05:00
Ben Marsh
129aac0526 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4706788 by Ben Marsh in Dev-Build branch]
2019-01-10 20:03:35 -05:00
Ben Marsh
287fa130a3 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4677654 by Ben Marsh in Dev-Build branch]
2019-01-02 20:42:29 -05:00
Ben Marsh
530369c613 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4662695 by Ben Marsh in Dev-Build branch]
2018-12-14 14:49:12 -05:00
Ben Marsh
8346d5c50a Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4634893 by Ben Marsh in Dev-Build branch]
2018-12-05 18:59:28 -05:00
Ben Marsh
b0da1f4fe7 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4577636 by Ben Marsh in Dev-Build branch]
2018-11-19 10:12:17 -05:00