Josh Adams
aa9705149b
Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing.
...
#rb none
[CL 11282608 by Josh Adams in Main branch]
2020-02-06 13:13:41 -05:00
Chris Gagnon
c3f9a18841
Merge from Main in prep for Dev-Tools-Staging Copy up
...
#rb none
[CL 11221539 by Chris Gagnon in Dev-Tools-Staging branch]
2020-02-04 17:00:31 -05:00
alexis matte
7a5b06e0e8
Downgrade the bone influence per vertex limit warning log to a message log
...
#rb uriel.doyon
#rnx
#ROBOMERGE-SOURCE: CL 11188721 via CL 11190333 via CL 11190439
#ROBOMERGE-BOT: (v640-11091645)
[CL 11191012 by alexis matte in Main branch]
2020-01-30 20:39:07 -05:00
Chris Gagnon
76c6bcbfeb
UE4 Main merged to Dev-Tools-Staging at CL 11164391
...
#rb none
[CL 11171981 by Chris Gagnon in Dev-Tools-Staging branch]
2020-01-29 20:39:37 -05:00
JeanMichel Dignard
84facd6d15
Copy from dev-enterprise cl 11097196
...
#rb none
#rnx
[CL 11099277 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-23 16:28:59 -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
471d972e62
Updating copyright for Engine Developer.
...
#rnx
#rb none
#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)
[CL 10870584 by ryan durand in Main branch]
2019-12-26 15:32:37 -05:00
alexis matte
a939a7fd42
Make sure we do not test against zero but against nearly zero when computing the tangents for skeletalmesh.
...
#rb benoit.deschenes
#ROBOMERGE-SOURCE: CL 10720808 via CL 10720846
#ROBOMERGE-BOT: (v610-10636431)
[CL 10720848 by alexis matte in Main branch]
2019-12-13 16:30:34 -05:00
alexis matte
9e7d085a5e
Fix propagating vertex color to custom LOD
...
#rb ryan.schmidt, richard.talbotwatkin
#ROBOMERGE-OWNER: alexis.matte
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 10681967 via CL 10684029 via CL 10684043
#ROBOMERGE-BOT: (v610-10636431)
[CL 10684074 by alexis matte in Main branch]
2019-12-12 14:40:57 -05:00
bob tellez
a9cc7133db
Back out changelist 10672659. Possible cause of asset corruption
...
[FYI] Alexis.Matte
#ROBOMERGE-OWNER: bob.tellez
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 10677601 via CL 10677680 via CL 10677713
#ROBOMERGE-BOT: (v610-10636431)
[CL 10677717 by bob tellez in Main branch]
2019-12-12 11:50:43 -05:00
alexis matte
7a86fb988a
Fix propagating vertex color to custom LOD
...
#rb ryan.schmidt, richard.talbotwatkin
#ROBOMERGE-OWNER: alexis.matte
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 10672659 via CL 10672742 via CL 10672749
#ROBOMERGE-BOT: (v610-10636431)
[CL 10672750 by alexis matte in Main branch]
2019-12-12 10:21:18 -05:00
Alexis Matte
9e5ba10ea8
Fix skeletalmesh conversion to use the LODMaterialMap when converting to a staticmesh.
...
#jira UE-83202
#rb benoit.deschenes
[CL 10056819 by Alexis Matte in Main branch]
2019-11-06 12:10:27 -05:00
rex hill
62bc081d51
Brought over changes related to Tool Menus
...
#rnx
#rb none
#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 9968254 via CL 9968365
#ROBOMERGE-BOT: (v560-9963197)
[CL 9969240 by rex hill in Main branch]
2019-11-04 12:21:36 -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
Alexis Matte
f5f97e8a3e
Fix crash when re-importing alternate skinning. This is a fallback from the skeletalmesh refactor
...
#jira none
#rb none
[CL 9549105 by Alexis Matte in Main branch]
2019-10-11 12:24:35 -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
Alexis Matte
430520a2f1
Fix degenerated triangle that introduce nan value into the normals when we compute them
...
#jira UE-79793
#rb david.hill
[CL 8551647 by Alexis Matte in Main branch]
2019-09-06 11:36:14 -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
Michael Lentine
f9b3324b32
Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 6903150
...
#rb none
#rnx
[CL 6903163 by Michael Lentine in Main branch]
2019-06-08 17:15:34 -04:00
james brinkerhoff
415d690243
Adding more null checks for LODModel.AdditionalIndexBuffers - we haven't seen a crash originating here yet, but there's potential for one
...
#ROBOMERGE-SOURCE: CL 6896153 via CL 6896160 via CL 6896172 via CL 6896264
#ROBOMERGE-BOT: (v366-6836689)
[CL 6896267 by james brinkerhoff in Main branch]
2019-06-07 17:07:26 -04:00
Lina Halper
b0bdc590d5
Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
...
#lockdown: thomas.sarkanen
#fyi: Laurent.Delayen
#rb: none
[CL 6861656 by Lina Halper in Dev-Anim branch]
2019-06-06 12:33:54 -04:00
stefan boberg
7f1f94b842
Copying //UE4/Dev-Core to Dev-Main (//UE4/Dev-Main)
...
#rb none
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: stefan.boberg
#ROBOMERGE-SOURCE: CL 6815521 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)
[CL 6821478 by stefan boberg in Dev-Anim branch]
2019-06-03 19:17:40 -04:00
thomas sarkanen
953c447204
Copying //Tasks/Fortnite/Dev-AnimSubInstances to Main (//Fortnite/Main)
...
Adds:
- New sub-instance functionality (dynamic setting, inline evaluation)
- Animation layers (experimental)
#rb Jurre.deBaare
[FYI] Laurent.Delayen
#rnx
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 6604742 via CL 6605911 via CL 6605970
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v364-6709755)
[CL 6719637 by thomas sarkanen in Dev-Anim branch]
2019-05-31 14:37:25 -04:00
jurre debaare
dbeec7eec3
Merging //Tasks/Fortnite/Dev-AlternativeSkinWeights/... to //Fortnite/Main/...
...
#rb Martin.Wilson
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6396117 via CL 6396387 via CL 6396453
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)
[CL 6458022 by jurre debaare in Dev-Anim branch]
2019-05-15 03:35:08 -04:00