Commit Graph

40 Commits

Author SHA1 Message Date
Andrew Davidson
3ddc3a4da3 Merge up from //UE5/Dev-LargeWorldCoordinates
#rb none

[CL 16211417 by Andrew Davidson in ue5-main branch]
2021-05-05 15:07:25 -04:00
Alexis Matte
73d83c6a38 To protect the skeletalmesh when using async operations like build or re-import we deprecate all public member variables of USkeletalMesh class and create the necessary getter and setter. Those member will stay public but will be move to private in a future release.
Adding a public member to USkeletalMesh class is now prohibed since it can break asynchronous operations that will be added next to this submit.

#rb danny.couture
#jira UEENT-3936
#rnx

[CL 14812920 by Alexis Matte in ue5-main branch]
2020-11-25 11:17:08 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
kriss gossart
96425848a9 Chaos Cloth - Fix MaxDistance weightmap creation after import.
#jira none
#rb none

[CL 14125136 by kriss gossart in ue5-main branch]
2020-08-17 13:45:18 -04:00
brooke hubert
48113fc77e Adding EditorFramework to build.cs files
#rnx
#Jira UE-96448
#rb chris.gagnon

[CL 14114839 by brooke hubert in ue5-main branch]
2020-08-14 13:24:16 -04:00
kriss gossart
28a4b6a2b5 Cloth - Add cloth editor text strings debug draw functionality.
Chaos Cloth - Add Particle Index debug draw.
Chaos Cloth - Add Maximum Distance Values debug draw.

#rb none
[FYI] Chase.Cooper

#ROBOMERGE-SOURCE: CL 13112819 via CL 13112823 via CL 13112843 via CL 13112866
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13112885 by kriss gossart in Main branch]
2020-04-30 05:40:56 -04:00
kriss gossart
cbf8d9a0d4 CIS - Fix non-unity build error caused by CL 12976746.
#rb none

#ROBOMERGE-SOURCE: CL 12982584 via CL 12982612 via CL 12982635
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12982641 by kriss gossart in Main branch]
2020-04-22 15:28:58 -04:00
kriss gossart
f768e96230 Cloth - Add cloth vertex budget warning in editor.
#rb none

#ROBOMERGE-SOURCE: CL 12976746 via CL 12976751 via CL 12976769
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12976788 by kriss gossart in Main branch]
2020-04-22 12:42:12 -04:00
kriss gossart
e4292c3cac Chaos Cloth - Rollback UClothLODDataCommon to FClothLODData to prevent crashes in SkeletalMesh PostLoad.
#jira UE-91075
#rb none
[FYI] Benn.Gallagher, Jaco.Vandyk

#ROBOMERGE-OWNER: kriss.gossart
#ROBOMERGE-AUTHOR: kriss.gossart
#ROBOMERGE-SOURCE: CL 12556067 via CL 12556089 via CL 12558368 via CL 12558401 via CL 12559878
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12559891 by kriss gossart in Main branch]
2020-04-02 14:15:35 -04:00
kriss gossart
0f037ea4fc Cloth - Fix old Apex cloth import that was missing the correct config.
- Make sure the current configs have finished loading before adding any mssing configs in UClothingAssetCommon::PostLoad().

#rb none
#jira UE-88781, UE-91181

#ROBOMERGE-SOURCE: CL 12473894 in //UE4/Release-4.25/... via CL 12473900 via CL 12473913
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v672-12450963)

[CL 12473925 by kriss gossart in Main branch]
2020-03-27 15:37:59 -04:00
kriss gossart
ed33a88325 Fix cloth authoring when applying a cloth made from a section to a different section (and set to be removed from mesh).
#jira UE-88718
#rb Alexis.Matte


#ROBOMERGE-SOURCE: CL 11423365 via CL 11423376 via CL 11423386
#ROBOMERGE-BOT: (v654-11333218)

[CL 11423395 by kriss gossart in Main branch]
2020-02-13 13:57:54 -05:00
Thomas Sarkanen
de2be528ca Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown nick.penwarden

[CL 11214797 by Thomas Sarkanen in Main branch]
2020-02-04 11:06:23 -05:00
halfdan ingvarsson
ac6dce0ff7 Add Persona as an include dependency to ClothingSystemEditor.
#jira none
#rb none

[CL 11089937 by halfdan ingvarsson in Main branch]
2020-01-22 18:58:16 -05:00
Lina Halper
44c1bb3292 COPY from //Dev-Anim to //Dev-Main
#rb: none
#fyi: Laurent.Delayen, Thomas.Sarkanen

[CL 11088765 by Lina Halper in Main branch]
2020-01-22 17:58:55 -05:00
ryan durand
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00
kriss gossart
a18007f52d Move common clothing asset functionalities to ClothingSystemRuntimeCommon to enable Chaos Cloth authoring.
Create a new ClothingSimulationFactory function to get the definitive default factory, for whatever cloth factories are actually enabled.
Rework nv cloth/apex dependencies in the ClothingSystemRuntimeNv module to allow the move of the legacy components and common config elements to the common module.
Add legacy cloth asset and runtime components to the common module to allow legacy assets to be loaded in a Chaos simulation, even with nv cloth disabled.
Allow storage of several configs to coexist in the ClothingAsset object config map, with their names as the key.
Resurrect the cloth physical mesh data structure to avoid the UClass overhead.
Add migration functions and BaseEngine redirectors to keep backward compatibility with legacy cloth assets, and assets saved after Ryan's refactor.

#rb Benn.Gallagher, Jaco.VanDyk


#ROBOMERGE-SOURCE: CL 10634739 via CL 10634740 via CL 10634741
#ROBOMERGE-BOT: (v608-10590470)

[CL 10634742 by kriss gossart in Main branch]
2019-12-10 05:02:44 -05:00
kriss gossart
5fd7dd8bfc Rename ClothLODDataBase to ClothLODDataCommon, and remove from the cloth runtime some related/minor dependencies to the nv module.
Also remove a bunch of unused get/set functions in the ClothMeshAdapter with unnecessary dependencies to the nv module.

#jira
#rb Benn.Gallagher, Jaco.VanDyk


#ROBOMERGE-SOURCE: CL 10318411 via CL 10318767 via CL 10318795
#ROBOMERGE-BOT: (v593-10286020)

[CL 10319252 by kriss gossart in Main branch]
2019-11-20 10:13:34 -05:00
Alexis Matte
fe503d708e Remerge cl: 9413572 into main it was backout in cl: 9418047
Undefine all portions of code that deal with the Apex clothing file import unless the project is built with Apex.
This is to prevent unnecessary Apex dependencies leaking into the Chaos Cloth asset code, and will allow the removal of PhysX when needed.

#rb Jaco.Vandyk
#jira UE-81340

[CL 9419541 by Alexis Matte in Main branch]
2019-10-04 11:26:38 -04:00
Alexis Matte
37868d2163 Back out changelist 9413572, it was a bad merge and need to be redone.
#rb none

[CL 9418047 by Alexis Matte in Main branch]
2019-10-04 10:11:57 -04:00
kriss gossart
f71c8515c7 Undefine all portions of code that deal with the Apex clothing file import unless the project is built with Apex.
This is to prevent unnecessary Apex dependencies leaking into the Chaos Cloth asset code, and will allow the removal of PhysX when needed.

#rb Jaco.Vandyk
#jira none

Merging //Fortnite/Main/Engine/Source/... to //UE4/Main/Engine/Source/...

[CL 9413572 by kriss gossart in Main branch]
2019-10-04 05:26:38 -04:00
michael lentine
acbc579509 Copy from //Fortnite/Dev-Physics
#rb none


#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 9374650 via CL 9374665
#ROBOMERGE-BOT: (v456-9359915)

[CL 9385990 by michael lentine in Main branch]
2019-10-02 17:27:26 -04:00
Michael Lentine
9db7de9fdf Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) [at] 9098278
#rb none
#rnx

[CL 9098401 by Michael Lentine in Main branch]
2019-09-25 13:55:37 -04:00
Thomas Sarkanen
8ba3c4c087 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
#rb none
#jira none

[CL 4665410 by Thomas Sarkanen in Dev-Anim branch]
2018-12-17 06:31:16 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Thomas Sarkanen
c51a339259 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4574801
#jira none
#rb none

[CL 4575789 by Thomas Sarkanen in Dev-Anim branch]
2018-11-19 07:03:18 -05:00