Commit Graph

42 Commits

Author SHA1 Message Date
jeanluc corenthin
1f438f8396 Fixed crash when 'merge actors' tries to create a mesh which name is already used by another type of asset
#jira UE-83445
#rb sebastien.luissier,alexis.matte
#rnx
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 10114966 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v587-10111126)

[CL 10114967 by jeanluc corenthin in Main branch]
2019-11-12 14:38:01 -05:00
Alexis Matte
c97c681a9f Fix skeletalmesh bake material crash, and incorrect ID remapping.
#jira UE-83204
#jira UE-83216
#rb benoit.deschenes

[CL 10056841 by Alexis Matte in Main branch]
2019-11-06 12:11:28 -05:00
JeanMichel Dignard
d4f0f4d3f2 Copying //UE4/Dev-Enterprise @ cl 9420543 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 9420574 by JeanMichel Dignard in Main branch]
2019-10-04 13:11:45 -04:00
Chris Gagnon
8ab0638182 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.24
#rb none

[CL 9325047 by Chris Gagnon in Main branch]
2019-10-01 20:41:42 -04:00
jon nabozny
6b60663f39 Update Engine and Plugins to use the new Getters / Setters for UActorComponent, USceneComponent, and AActor replicated properties
[at]Ryan.Gerleve, [at]Brian.Bekich
#rb None


#ROBOMERGE-OWNER: jon.nabozny
#ROBOMERGE-AUTHOR: jon.nabozny
#ROBOMERGE-SOURCE: CL 9290108 via CL 9290249
#ROBOMERGE-BOT: (v452-9288972)

[CL 9290520 by jon nabozny in Main branch]
2019-09-29 16:49:10 -04:00
sebastien lussier
21447d2bd7 Do not exclude static mesh subclasses from the mesh merge process
#ROBOMERGE-SOURCE: CL 9152055 via CL 9152079 via CL 9152095
#ROBOMERGE-BOT: (v443-9013191)

[CL 9152099 by sebastien lussier in Main branch]
2019-09-26 13:09:15 -04:00
sebastien lussier
6f9d431e83 Fixed merged meshes having wrong material mapping
#jira UE-80604


#ROBOMERGE-SOURCE: CL 8934573 via CL 8934580 via CL 8934591
#ROBOMERGE-BOT: (v435-8929571)

[CL 8934596 by sebastien lussier in Main branch]
2019-09-20 15:47:52 -04:00
sebastien lussier
9462f6b7ac HLOD building crashes when building
Cherrypicked CL8214461 from Dev-Enterprise
#jira UE-79203


#ROBOMERGE-SOURCE: CL 8224679 via CL 8230150
#ROBOMERGE-BOT: (v401-8057353)

[CL 8230887 by sebastien lussier in Main branch]
2019-08-23 12:08:39 -04:00
sebastien lussier
c5d90f6078 HLOD - Allow merging of HISM to the resulting mesh
Also allow merging of H(ISM) from the mesh merging tool
#jira UE-79239
jeanfrancois.dube


#ROBOMERGE-SOURCE: CL 8220928 via CL 8221461 via CL 8229897
#ROBOMERGE-BOT: (v401-8057353)

[CL 8230715 by sebastien lussier in Main branch]
2019-08-23 12:04:04 -04:00
sebastien lussier
0f9bcd5fda Fix crash when building HLODs
Interated from main
#jira UE-79211
#lockdown cristina.riveron
#rb none

#ROBOMERGE-SOURCE: CL 8219953 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v401-8057353)

[CL 8220049 by sebastien lussier in Main branch]
2019-08-22 22:43:55 -04:00
sebastien lussier
30effd5e1c Crash building HLOD with imposters only
#jira UE-77796
#rb none
[FYI] bryce.lumpkin, stuart.fitzsimmons


#ROBOMERGE-SOURCE: CL 8150397 via CL 8150412 via CL 8153526
#ROBOMERGE-BOT: (v401-8057353)

[CL 8161581 by sebastien lussier in Main branch]
2019-08-21 09:52:37 -04:00
richard talbotwatkin
c0ef3053d2 Deprecated direct access to UStaticMesh::SourceModels, SectionInfoMap and OriginalSectionInfoMap.
Added new accessors for getting individual SourceModels, or the entire array.
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 7668562 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7668565 by richard talbotwatkin in Main branch]
2019-07-31 03:40:45 -04:00
sebastien lussier
4f1a715182 Added the option "Create Merged Material" to mesh merging settings
* Option is disabled by default
* When enabled, the resulting merged mesh will have:
** An additional unused material which is created from the merge of all meshes materials
** An additional set of UV coordinates that can be used to apply the merged material to any section of the mesh
** Added additional static switch params to BaseFlattenMaterials to allow specifying UV channel
[FYI] jurre.debaare
#rnx


#ROBOMERGE-SOURCE: CL 7473968 via CL 7474018
#ROBOMERGE-BOT: (v372-7473910)

[CL 7474030 by sebastien lussier in Main branch]
2019-07-22 08:22:52 -04:00
JeanMichel Dignard
0f9ad96858 Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)
#lockdown nick.penwarden
#rb none

[CL 6890764 by JeanMichel Dignard in Main branch]
2019-06-07 11:22:52 -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
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
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
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
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