Commit Graph

62 Commits

Author SHA1 Message Date
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
sebastien lussier
44edaff438 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-SOURCE: CL 6675359 via CL 6675861
#ROBOMERGE-BOT: (vundefined-6665479)

[CL 6675880 by sebastien lussier in Main branch]
2019-05-30 10:37:45 -04:00
alexis matte
90a4a518da Force automation process to not use the ddc when executing merge actor test for staticmesh
#rb jurre.debaare
#jira UE-72667


#ROBOMERGE-SOURCE: CL 6476239 via CL 6476594

[CL 6476626 by alexis matte in Main branch]
2019-05-15 09:30:49 -04:00
alexis matte
93de9edd67 Tentative, fix crash when generating HLOD with impostor
#jira UE-73420
#rb none
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 6256521 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6317323 by alexis matte in Main branch]
2019-05-06 11:32:24 -04:00
sebastien lussier
c545e330ef 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-SOURCE: CL 6252335 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6317322 by sebastien lussier in Main branch]
2019-05-06 11:32:22 -04:00
marc audy
08a23d34db 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: marc.audy
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 6190448 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6317275 by marc audy in Main branch]
2019-05-06 11:31:48 -04:00
jurre debaare
b79697a4cf 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-SOURCE: CL 6104752 via CL 6104754 via CL 6105018

[CL 6105094 by jurre debaare in Main branch]
2019-04-26 09:47:57 -04:00
jurre debaare
4dc770c891 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-SOURCE: CL 6076717 via CL 6076719 via CL 6077848

[CL 6078008 by jurre debaare in Main branch]
2019-04-24 11:04:00 -04:00
alexis matte
3777778347 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-SOURCE: CL 6023508 via CL 6023509 via CL 6024040

[CL 6024213 by alexis matte in Main branch]
2019-04-19 19:00:45 -04:00
alexis matte
aba818d27a Fix a material ID issue with HLOD, by sorting the section mapping
#rb none


#ROBOMERGE-SOURCE: CL 5808584 via CL 5808586 via CL 5808587 via CL 5811617

[CL 5811867 by alexis matte in Main branch]
2019-04-09 16:18:12 -04:00
alexis matte
2e23ecefeb Need to Abs the X scale of the actor transform when generating imposter HLOD mesh.
#rb jurre.debaar


#ROBOMERGE-SOURCE: CL 5669391 via CL 5669393 via CL 5669505 via CL 5669539 via CL 5671569

[CL 5671746 by alexis matte in Main branch]
2019-04-01 14:23:00 -04:00
alexis matte
5339402247 Fix material swap when merging imposter
#rb none


#ROBOMERGE-SOURCE: CL 5669159 via CL 5669160 via CL 5669495 via CL 5669531 via CL 5671540

[CL 5671695 by alexis matte in Main branch]
2019-04-01 14:22:43 -04:00
alexis matte
9b640e5c44 Make sure the imposter materials are assign properly when there is more then one different imposter in the HLOD.
#rb none


#ROBOMERGE-SOURCE: CL 5659664 via CL 5659665 via CL 5659666 via CL 5659667 via CL 5659711

[CL 5659716 by alexis matte in Main branch]
2019-03-29 21:34:29 -04:00
alexis matte
4a75e4824b Fix the imposter mesh merge
#rb none


#ROBOMERGE-SOURCE: CL 5659536 via CL 5659537 via CL 5659538 via CL 5659539 via CL 5659639

[CL 5659641 by alexis matte in Main branch]
2019-03-29 20:53:37 -04:00
alexis matte
53aed53d80 Fix HLOD proxy build assert
#rb none


#ROBOMERGE-SOURCE: CL 5639421 via CL 5639422 via CL 5639423 via CL 5639656 via CL 5640999

[CL 5647746 by alexis matte in Main branch]
2019-03-29 13:32:05 -04:00
alexis matte
1f50166b38 fix from 4.22 cl:5317646
Fix MeshMergeUtilities when remapping polygon group
#jira UE-71016
#rb none


#ROBOMERGE-SOURCE: CL 5518756 via CL 5518757 via CL 5518962

[CL 5535932 by alexis matte in Main branch]
2019-03-25 14:06:35 -04:00
alexis matte
2875a3c6c6 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-SOURCE: CL 5504837 via CL 5504994 via CL 5517943

[CL 5535766 by alexis matte in Main branch]
2019-03-25 14:01:20 -04:00
johan duparc
5cc4c17e48 Fix crash on edit after ProxyLOD merge
#jira UE-70972
#rb JeanLuc.Corenthin

#ROBOMERGE-SOURCE: CL 5355841 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5367791 by johan duparc in Main branch]
2019-03-12 06:52:45 -04:00
alexis matte
8605d5a215 Fix mesh merge utilities LOD extra material
#jira UE-70753
#rb none

#ROBOMERGE-SOURCE: CL 5337463 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5338031 by alexis matte in Main branch]
2019-03-07 11:58:41 -05:00
user37337
a8e93a4550 PR #5167: Fix infinite loop while building HLOD proxy meshes (Contributed by user37337)
#jira UE-65147
#rb Thomas.Sarkanen

#ROBOMERGE-SOURCE: CL 5336919 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5337927 by jurre debaare in Main branch]
2019-03-07 11:44:50 -05:00
jurre debaare
26a1e2f83f Textures and Materials have their merged actor's name appended to their names
#jira UE-68800
#rb Thomas.Sarkanen

#ROBOMERGE-SOURCE: CL 5336917 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5337919 by jurre debaare in Main branch]
2019-03-07 11:44:46 -05:00
alexis matte
7c430ab02a Fix MeshMergeUtilities when remapping polygon group
#jira UE-71016
#rb none

#ROBOMERGE-SOURCE: CL 5317646 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5336840 by alexis matte in Main branch]
2019-03-07 08:13:58 -05:00
Chris Gagnon
80918bea22 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
Marcus Wassmer
6995e20184 Merging //UE4/Dev-Main@4848702 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
#lockdown rolando.caloca

[CL 4854488 by Marcus Wassmer in Dev-Rendering branch]
2019-01-30 20:34:55 -05:00
Chris Gagnon
a48e767b94 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4835066 by Chris Gagnon in Dev-Editor branch]
2019-01-29 16:15:19 -05:00