Commit Graph

44 Commits

Author SHA1 Message Date
Zousar Shaker
8cb2ea3473 Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr)
Call-site changes for non-scalar wrapped object pointer upgrade that overlap with automated pointer changes.

#rb devin.doucette

[CL 14822398 by Zousar Shaker in ue5-main branch]
2020-11-30 14:57:34 -04:00
danny couture
be6b1d4a88 Use const skeletal mesh when possible
#rb Alexis.Matte

[CL 14815858 by danny couture in ue5-main branch]
2020-11-26 10:04:53 -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
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Zousar Shaker
77d13185b7 Copying //UE5/Dev-Cooker@14539516 to Main (//UE5/Main)
[CL 14539954 by Zousar Shaker in ue5-main branch]
2020-10-21 17:56:05 -04:00
kriss gossart
18feecaa00 Chaos Cloth - Add point based wind model to ensure PhyX cloth asset backward compatibility (AKA "Legacy Wind"). [Merging CL 14397275]
#jira UE-90581, UE-94480
#rb none

[CL 14398091 by kriss gossart in ue5-main branch]
2020-09-25 13:44:05 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
kriss gossart
7e64c29202 Chaos Cloth - Merging recent UE4 cloth fixes and improvements.
- Increase the Wind Strength slider max value to 10 in the Mesh Editor Character menu. [Merging 14207388]
- Fix already applied scale on cloth simulation data. [Merging 14207398]
- Add wind liift force. [ Merging 14207443]
- Update default Drag and Lift coefficients, and add Lift migration from NvCloth. [Merging 14207938]
- Re-enable wind/velocity fields debug drawing. Remove Drag from the name of the debug draw option since it now also draws Lift. [Merging 14208392]
- Fix config migration due to config object name collision. [Merging 14208623]
- Fix bounds calculation of empty simulation (causing the thumbnail to vanish) due to a missing implementation of ShouldSimulate(). [Merging 14226731]

#rb none
#jira UE-96937, UE-86354, UE-86354, UE-95633, UE-97082

[CL 14243012 by kriss gossart in ue5-main branch]
2020-09-02 05:08:22 -04:00
kriss gossart
7a777cf2dc Chaos Cloth - LOD/graph node refactor.
- Add multi LOD support.
- Add simulation Mesh, Cloth, Collider, and Solver graph node ready classes.
- Fix backstop, and improve backstop debug draw.
- Add Anim debug draw.
- Output cloth sim data in local space.

#jira UESP-3283
#fyi Chris.Caulfield, Michael.Lentine
#rb none

[CL 14112532 by kriss gossart in ue5-main branch]
2020-08-14 06:18:22 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
michael lentine
631ffaa5ea Accelerate cloth binding.
#rb Benn.Gallagher, Chris.Caulfield

#ROBOMERGE-SOURCE: CL 13181746 via CL 13181747 via CL 13181748
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v688-13145358)

[CL 13181876 by michael lentine in Main branch]
2020-05-05 13:05:09 -04:00
kriss gossart
04f021f243 Cloth - Fix assert "Attempting to replace an object that hasn't been fully loaded: ClothConfigNv object" when loading 4.24 skeletal mesh assets with cloths.
#jira UE-92624
#rb Benn.Gallagher

[CL 13113555 by kriss gossart in Main branch]
2020-04-30 06:49:27 -04:00
kriss gossart
c30351a9c5 Cloth - Fix cloth vertex mapping to render section when one or two points of an element are fixed, allowing to now draw triangles that are partially attached as simulating rather than skinned.
#rb Jurre.deBaare

#ROBOMERGE-SOURCE: CL 13054220 via CL 13054221 via CL 13054222
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13054223 by kriss gossart in Main branch]
2020-04-28 06:32:24 -04:00
kriss gossart
fa8691491c Cloth - Fixed broken binding in Editor on 4.24 cloth assets.
#jira UE-91075
#rb None

#ROBOMERGE-SOURCE: CL 12624932 in //UE4/Release-4.25/... via CL 12624935 via CL 12624938
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12624946 by kriss gossart in Main branch]
2020-04-06 13:21:43 -04:00
kriss gossart
a1f687ad14 Fix CIS from CL 12556067, error: use of undeclared identifier 'ClothingCustomVersion'
#rb none

#ROBOMERGE-SOURCE: CL 12558841 via CL 12558843 via CL 12558845 via CL 12558846 via CL 12560079
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12560299 by kriss gossart in Main branch]
2020-04-02 14:18:31 -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
cad0f14413 Chaos Cloth - Expose friction coefficient to try limit sliding around collision volumes.
- Add per cloth thickness.
- Add shared config to config migration path.
- Fix cloth asset PostLoad migration issues.

[FYI] Benn.Gallagher, Jaco.VanDyk
#jira UE-86455, FORT-255441, FORT-265142


#ROBOMERGE-SOURCE: CL 12308056 via CL 12308064 via CL 12308068 via CL 12310129
#ROBOMERGE-BOT: (v670-12295787)

[CL 12310238 by kriss gossart in Main branch]
2020-03-19 16:17:23 -04:00
kriss gossart
c45f59a735 Fix CIS error 'MaxDistanceScale' is not a base or member.
#rb none


#ROBOMERGE-SOURCE: CL 12137208 via CL 12137216 via CL 12137221
#ROBOMERGE-BOT: (v659-12123632)

[CL 12137226 by kriss gossart in Main branch]
2020-03-11 14:37:58 -04:00
kriss gossart
7c1e295410 Chaos Cloth - Enable the SkeletalMeshComponent SetMaxDistanceScale BP function in Chaos Cloth.
[fyi] Gustav.Melich, Michael.Lentine

Merging CL 12116735


#ROBOMERGE-SOURCE: CL 12123731 via CL 12123732 via CL 12130734
#ROBOMERGE-BOT: (v659-12123632)

[CL 12130926 by kriss gossart in Main branch]
2020-03-11 12:14:43 -04:00
kriss gossart
d4c58783b3 Chaos Cloth - Fix ReferenceBoneIndex calculations and mapping.
- Fix the ClothLodData and PhysicalMeshData migration code that was missing ConditionalPostLoad.

[FYI] Benn.Gallagher


#ROBOMERGE-SOURCE: CL 11461748 via CL 11461751 via CL 11461756
#ROBOMERGE-BOT: (v654-11333218)

[CL 11461757 by kriss gossart in Main branch]
2020-02-17 13:45:23 -05:00
alexis matte
bf454087c3 Fix crash when unbinding cloth after the user remove the asset in the sklemesh editor.
#jira UE-86998
#jira UE-86948
#rb benoit.deschenes
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 11078236 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v637-11041722)

[CL 11078248 by alexis matte in Main branch]
2020-01-21 18:07:45 -05:00
kriss gossart
dd9c712bad Chaos Cloth - Add missing Chaos Cloth teleport mode.
- Move teleport property from the nv cloth context to the common cloth context.
- Fix Chaos Cloth particle and collision particle initializations.

[FYI] Jaco.VanDyk


#ROBOMERGE-SOURCE: CL 10944730 via CL 10944735 via CL 10945108 via CL 10945131
#ROBOMERGE-BOT: (v632-10940481)

[CL 10945155 by kriss gossart in Main branch]
2020-01-10 15:54:40 -05:00
kriss gossart
ccc207e37b Chaos Cloth - Fix time related issues while removing redundant solver substepping and SolverFrequency parameter.
Note: the previous context refactor actually fixed the hitch/jiggling related issue.

#rb none


#ROBOMERGE-SOURCE: CL 10927742 via CL 10928149 via CL 10928154 via CL 10928161
#ROBOMERGE-BOT: (v626-10872990)

[CL 10928163 by kriss gossart in Main branch]
2020-01-09 12:09:36 -05:00