izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
105,466 Commits 23 Branches 254 Tags
9fa00a048292eb6d64eec072fce59cda50226476
Commit Graph

70 Commits

Author SHA1 Message Date
Sebastien Lussier
f377fc4095 #jira UE-84610 
Fixed CIS warning
#rnx
#rb none

[CL 10286400 by Sebastien Lussier in Main branch]
 2019-11-18 10:54:23 -05:00
sebastien lussier
9fb42b5d8a Compare all set of UVs when trying to merge polygons in FMeshDescriptionOperations::GenerateUniqueUVsForStaticMesh 
Swap vertices in material baking when mesh is mirrored
#rb none

#ROBOMERGE-OWNER: sebastien.lussier
#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 10285512 via CL 10285513 via CL 10285514
#ROBOMERGE-BOT: (v591-10236483)

[CL 10285554 by sebastien lussier in Main branch]
 2019-11-18 09:08:13 -05:00
benoit deschenes
edffde373c Integrating CL# 9607649 from Dev-Enterprise 
Adding nan check when generating normals + fixed reimporting SceneFbx could corrupt the default import values config

#jira UE-78003
#rb Alexis.Matte

[CL 9621108 by benoit deschenes in 4.24 branch]
 2019-10-16 14:25:01 -04: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
Chris Gagnon
2e87118a18 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24. 
#rb none

[CL 8614014 by Chris Gagnon in Main branch]
 2019-09-10 11:35:20 -04:00
benoit deschenes
e643d5ef0c Enterprise UV Generation tool - Integrating CL 6893582, 6954109, 6957407, 6962916, 6969266, 6969351, 7004882, 7047829 
#jira UE-76375 UEENT-2547 UE-76155 UE-76157 UE-76169 UE-76164 UE-76154 UE-76165 UE-76170 UE-76288
#rb none

#ROBOMERGE-SOURCE: CL 7057829 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7057831 by benoit deschenes in Main branch]
 2019-06-17 18:26:10 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469 
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
 2019-06-11 18:27:07 -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
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
alexis matte
604ebe6ee1 Cherry pick 4.22 release fix (cl: 5337966) 
Fix the packing of UV, make sure the temporary destination has enough indices to receive the new computed UVLightMap
#jira UE-71048
#rb none


#ROBOMERGE-SOURCE: CL 5503577 via CL 5503581 via CL 5504282

[CL 5535606 by alexis matte in Main branch]
 2019-03-25 13:56:06 -04:00
alexis matte
a081ab1967 Fix the packing of UV, make sure the temporary destination has enough indices to receive the new computed UVLightMap 
#jira UE-71048
#rb none

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

[CL 5338978 by alexis matte in Main branch]
 2019-03-07 13:41:48 -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
anousack kitisa
29a2b59faa Fixed box mapping generation to fit in [0, 1] range (when there's no tiling). 
#jira UE-68727

#rb JeanLuc.Corenthin

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

[CL 4971422 by anousack kitisa in Main branch]
 2019-02-12 11:11:18 -05:00
alexis matte
a07870bbfe #CodeReview: alexis.matte,cristina.riveron,nick.bullard,nick.penwarden 
Merge conflict.
alexis.matte, please merge this change by hand.
More info at https://robomerge.epicgames.net#RELEASE

/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json - merging //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png - vs //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json - merging //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png - vs //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json - merging //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png - vs //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png#2
Delete resolve:
at: delete
ay: ignore


--------------------------------------
Revert a material fix done for UE-67819, this change broke old assets.
#jira UE-69652
#rb none

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

[CL 4953006 by alexis matte in Main branch]
 2019-02-08 17:32:01 -05:00
johan duparc
a79abfeef5 Copy of 4923653, 4923695 from //UE4/Dev-Enterprise: 
UV packing issue for geometries with high chart count
#jira UE-69450
#jira UE-56602
#jira UE-56555
#jira UEENT-322
#rb JeanMichel.Dignard

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

[CL 4923746 by johan duparc in Main branch]
 2019-02-06 15:01:38 -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
Marcus Wassmer
48cc6051f0 Merging //UE4/Dev-Main@4835686 to Dev-Rendering (//UE4/Dev-Rendering) 
#lockdown rolando.caloca
#rb none

[CL 4836748 by Marcus Wassmer in Dev-Rendering branch]
 2019-01-29 17:55:04 -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
Richard TalbotWatkin
f2a3f32edf Change to FMeshDescription API. CreatePolygon[WithID] now takes a simple array of vertex instances instead of FMeshDescription::ContourPoint, hence there is no need to specify corresponding edge IDs. Any edges which do not exist in the mesh description will be automatically created by CreatePolygon, and their IDs returned. 
Fixed up all code to use the new method, fixed a few bugs.
#rb Alexis.Matte

[CL 4750082 by Richard TalbotWatkin in Dev-Editor branch]
 2019-01-18 06:37:35 -05:00
Marcus Wassmer
834e95f3d3 Merging //UE4/Dev-Main@4680011 to Dev-Rendering (//UE4/Dev-Rendering) 
#rb none

[CL 4680455 by Marcus Wassmer in Dev-Rendering branch]
 2019-01-03 19:28:34 -05:00
Marcus Wassmer
cbfcbbb93b Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering) 
#rb none
Should be just copyright updates

[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
 2019-01-03 19:16:26 -05:00
Alexis Matte
529ff0922a Fix the ConvertToRawMesh keep the section order use in the source MeshDescription. 
Update one asset affect by the bug and update the screenshot tests
#jira UE-67819
#rb richard.talbotwatkin

[CL 4679457 by Alexis Matte in Dev-Editor branch]
 2019-01-03 14:56:22 -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