Commit Graph

14 Commits

Author SHA1 Message Date
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
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
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
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
Francis Hurteau
57c677da93 Copying //UE4/Dev-Enterprise@4705006 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4705151 by Francis Hurteau in Main branch]
2019-01-10 17:26:53 -05:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Richard TalbotWatkin
e74a1e7fc4 - Deprecated FRawMesh as source model serialization format for static meshes.
- MeshDescription now held as compressed bulk data and unpacked on demand. This is managed by FMeshDescriptionBulkData.
- Made RawMesh accessors in StaticMesh responsible for performing legacy conversion from MeshDescription if necessary.
- Added FBulkDataReader/FBulkDataWriter for serializing bulk data to/from archives.
- Added FUntypedBulkData::UnloadBulkData() for releasing the bulk data allocation without invalidating it (so it can be reloaded when necessary). Editor only.
- Renamed StaticMesh MeshDescription methods (now GetMeshDescription(), CommitMeshDescription() etc).
- Removed unnecessary mesh description attributes from StaticMesh: those which are used only by Editable Mesh, and transient attributes which are automatically generated when needed for building vertex tangent space.
- Slight change to FAttributesSetBase::RegisterAttribute(): if the attribute specified already exists, it will be amended to adopt the type, passed flags and number of indices. If only the number of indices changes, any existing data will be preserved if possible.
- Added TMeshAttributesRef::Copy() to copy an entire attributes array from one name/index to another.
- Changed implementation of TMeshAttributesRef/TMeshAttributesView to provide a const ref/view if the template type parameter is const. Added TMeshAttributesConstRef/TMeshAttributesConstView as an alias for backwards compatibility.
- Added FMeshDescription::IsEmpty() for determining whether a mesh description has any content or not.
- Removed versioning GUID for mesh description: this should be handled by each mesh description client now.

#rb Alexis.Matte

[CL 4644791 by Richard TalbotWatkin in Dev-Editor branch]
2018-12-10 09:29:08 -05:00
Alexis Matte
8b96dc21df Deprecate FRawMesh - Mesh merge utilities
#jira UE-64437
#rb none

[CL 4424092 by Alexis Matte in Dev-Editor branch]
2018-10-03 16:09:08 -04: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