Commit Graph

7040 Commits

Author SHA1 Message Date
JeanFrancois Dube
e7f37d8b09 Avoid memcopies in MergeFlattenedMaterials.
#rb danny.couture

[CL 11535927 by JeanFrancois Dube in Main branch]
2020-02-19 06:42:29 -05:00
JeanFrancois Dube
7d3d157816 Integrate 11534852 from 4.25: Add missing flattened material property enum that was missed when anisotropy was added.
#jira UE-89011, UE-89068, UE-89035
#fyi danny.couture
#rb none

[CL 11535904 by JeanFrancois Dube in Main branch]
2020-02-19 06:34:52 -05:00
dan oconnor
98628be41e ExpandEnumAsExecs now works with bool parameters, added ExpandBoolAsExecs synonym
#rb Phllip.Kavan
#jira UE-89057


#ROBOMERGE-SOURCE: CL 11522401 via CL 11522407 via CL 11522423
#ROBOMERGE-BOT: (v654-11333218)

[CL 11525131 by dan oconnor in Main branch]
2020-02-18 17:21:46 -05:00
william ewen
9d79d3b1e2 Adding 'delete' button on individual comparisons in the Screenshot Comparison Browser
#rb Clayton.Langford


#ROBOMERGE-SOURCE: CL 11515956 via CL 11516012
#ROBOMERGE-BOT: (v654-11333218)

[CL 11518052 by william ewen in Main branch]
2020-02-18 16:25:11 -05:00
rex hill
2d96fa4999 Level editor viewport's toolbar converted into tool menu
#rnx


#ROBOMERGE-SOURCE: CL 11509651 via CL 11513214 via CL 11513459
#ROBOMERGE-BOT: (v654-11333218)

[CL 11513833 by rex hill in Main branch]
2020-02-18 15:40:24 -05:00
thomas sarkanen
d2d979bd11 Fixed previous frame button on Gameplay insights transport controls
Fixes off-by-one error in frames provider
This caused frames to be mis-reported when using FFrameProvider::GetFrameFromTime.

#jira UE-88149 - Previous frame button on Gameplay insights transport control has no impact
#rb Jurre.deBaare

#ROBOMERGE-SOURCE: CL 11498367 in //UE4/Release-4.25/... via CL 11498372
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11498375 by thomas sarkanen in Main branch]
2020-02-18 09:34:20 -05:00
thomas sarkanen
41e6a172af Fixed previous frame button on Gameplay insights transport controls
Fixes off-by-one error in frames provider
This caused frames to be mis-reported when using FFrameProvider::GetFrameFromTime.

#jira UE-88149 - Previous frame button on Gameplay insights transport control has no impact
#rb Jurre.deBaare

#ROBOMERGE-SOURCE: CL 11498367 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11498372 by thomas sarkanen in 4.25-Plus branch]
2020-02-18 09:33:45 -05:00
helge mathee
bc1e6d6648 RigVM AST: Moved the lookup from AST Node to Expression Index to a map, since now with nested nodes the Node index itself cannot be relied on.
#rb lina.halper
#jira UE-88252

Merging

//UE4/Dev-Anim/Engine/Source/Developer/RigVMDeveloper/...

to //UE4/Dev-Anim/Engine/Source/Developer/RigVMDeveloper/...

#ROBOMERGE-SOURCE: CL 11498311 in //UE4/Release-4.25/... via CL 11498330
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11498353 by helge mathee in Main branch]
2020-02-18 09:32:56 -05:00
helge mathee
d2a643f1f4 Instead of accessing sub array elements on a default struct we create a new structonscope for the inner property and use that instead. The array property might be empty - so relying on that isn't stable and can cause crashes as hit in UE-88394
#rb lina.halper
#jira UE-88394

Merging

//UE4/Dev-Anim/Engine/Source/Developer/RigVMDeveloper/Private/RigVMModel/RigVMController.cpp

to //UE4/Release-4.25/Engine/Source/Developer/RigVMDeveloper/Private/RigVMModel/RigVMController.cpp

#ROBOMERGE-SOURCE: CL 11498307 in //UE4/Release-4.25/... via CL 11498326
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11498350 by helge mathee in Main branch]
2020-02-18 09:32:52 -05:00
helge mathee
60a1b432f7 RigVM AST: Moved the lookup from AST Node to Expression Index to a map, since now with nested nodes the Node index itself cannot be relied on.
#rb lina.halper
#jira UE-88252

Merging

//UE4/Dev-Anim/Engine/Source/Developer/RigVMDeveloper/...

to //UE4/Dev-Anim/Engine/Source/Developer/RigVMDeveloper/...

#ROBOMERGE-SOURCE: CL 11498311 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11498330 by helge mathee in 4.25-Plus branch]
2020-02-18 09:32:18 -05:00
helge mathee
b7c3bfa7cc Instead of accessing sub array elements on a default struct we create a new structonscope for the inner property and use that instead. The array property might be empty - so relying on that isn't stable and can cause crashes as hit in UE-88394
#rb lina.halper
#jira UE-88394

Merging

//UE4/Dev-Anim/Engine/Source/Developer/RigVMDeveloper/Private/RigVMModel/RigVMController.cpp

to //UE4/Release-4.25/Engine/Source/Developer/RigVMDeveloper/Private/RigVMModel/RigVMController.cpp

#ROBOMERGE-SOURCE: CL 11498307 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11498326 by helge mathee in 4.25-Plus branch]
2020-02-18 09:32:14 -05:00
helge mathee
005f99f998 Control Rig: Fix error log for UE-88390
#jira UE-88390
#rb na

Merging

//UE4/Dev-Anim/Engine/Source/Developer/RigVMDeveloper/Private/RigVMModel/RigVMController.cpp

to //UE4/Dev-Anim/Engine/Source/Developer/RigVMDeveloper/Private/RigVMModel/RigVMController.cpp

#ROBOMERGE-SOURCE: CL 11498280 in //UE4/Release-4.25/... via CL 11498293
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11498303 by helge mathee in Main branch]
2020-02-18 09:31:33 -05:00
helge mathee
223157a801 Control Rig: Fix error log for UE-88390
#jira UE-88390
#rb na

Merging

//UE4/Dev-Anim/Engine/Source/Developer/RigVMDeveloper/Private/RigVMModel/RigVMController.cpp

to //UE4/Dev-Anim/Engine/Source/Developer/RigVMDeveloper/Private/RigVMModel/RigVMController.cpp

#ROBOMERGE-SOURCE: CL 11498280 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11498293 by helge mathee in 4.25-Plus branch]
2020-02-18 09:30:55 -05:00
mieszko zielinski
5d3b0465a9 Made it possible to summon in-game hud for GameplayDebugger during replay playback
Yoan.StAmant, Maxime.Mercier
#rb Yoan.StAmant, Maxime.Mercier


#ROBOMERGE-SOURCE: CL 11496843 via CL 11496844 via CL 11496845
#ROBOMERGE-BOT: (v654-11333218)

[CL 11496846 by mieszko zielinski in Main branch]
2020-02-18 05:57:18 -05:00
benoit deschenes
ec5edba1ae Integrating CL#11136074 from Dev-Enterprise
Fixing Python asset import task returning wrong path when not combining mesh.

#jira UE-72503
#rb none

#ROBOMERGE-SOURCE: CL 11461632 in //UE4/Release-4.25/... via CL 11461660
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11462399 by benoit deschenes in Main branch]
2020-02-17 14:23:08 -05:00
benoit deschenes
d9e39b0502 Integrating CL#11259478 from Dev-Enterprise
Fixing memory leak when GC is not called in datasmith mesh exporter

#jira UE-87989
JeanMichel.Dignard
#rb JeanMichel.Dignard

#ROBOMERGE-SOURCE: CL 11461470 in //UE4/Release-4.25/... via CL 11461475
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11462375 by benoit deschenes in Main branch]
2020-02-17 14:22:56 -05:00
emil kirichev
ce63c52e75 Illegal characters in texture name don't survive datasmith export
Integrated from Dev-Enterprise (CL 11279033)

#jira UE-87907
#rb JeanLuc.Corenthin

#ROBOMERGE-SOURCE: CL 11459086 in //UE4/Release-4.25/... via CL 11459090
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11462234 by emil kirichev in Main branch]
2020-02-17 14:21:13 -05:00
benoit deschenes
ab17f991c8 Integrating CL#11136074 from Dev-Enterprise
Fixing Python asset import task returning wrong path when not combining mesh.

#jira UE-72503
#rb none

#ROBOMERGE-SOURCE: CL 11461632 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11461660 by benoit deschenes in 4.25-Plus branch]
2020-02-17 13:39:58 -05:00
benoit deschenes
3b89afbfb1 Integrating CL#11259478 from Dev-Enterprise
Fixing memory leak when GC is not called in datasmith mesh exporter

#jira UE-87989
JeanMichel.Dignard
#rb JeanMichel.Dignard

#ROBOMERGE-SOURCE: CL 11461470 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11461475 by benoit deschenes in 4.25-Plus branch]
2020-02-17 13:28:31 -05:00
emil kirichev
b74abd7b27 Illegal characters in texture name don't survive datasmith export
Integrated from Dev-Enterprise (CL 11279033)

#jira UE-87907
#rb JeanLuc.Corenthin

#ROBOMERGE-SOURCE: CL 11459086 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11459090 by emil kirichev in 4.25-Plus branch]
2020-02-17 08:01:59 -05:00
alexis matte
16f0a45fba Optimize the polygonshell chunking algorithm
#rb lina.halper
#rnx


#ROBOMERGE-SOURCE: CL 11452152 via CL 11452154
#ROBOMERGE-BOT: (v654-11333218)

[CL 11452155 by alexis matte in Main branch]
2020-02-14 18:37:33 -05:00
jamie dale
25e852a5e8 Fixed localization conflicts
#jira
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 11448060 in //UE4/Release-4.25/... via CL 11448075
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11448100 by jamie dale in Main branch]
2020-02-14 15:49:24 -05:00
jamie dale
db9507f916 Fixed localization conflicts
#jira
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 11448060 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11448075 by jamie dale in 4.25-Plus branch]
2020-02-14 15:48:32 -05:00
dave belanger
a32107b87c Add option on whether to prompt user with checkout dialog in AssetFixUpRedirectors and use it to avoid pop-up in PPID generation.
#rb Rex.Hill


#ROBOMERGE-SOURCE: CL 11447143 via CL 11447144 via CL 11447146
#ROBOMERGE-BOT: (v654-11333218)

[CL 11447152 by dave belanger in Main branch]
2020-02-14 15:01:22 -05:00
Matt Peters
40f55732ba #jira FORT-236167
[REVIEW]
#rb Graeme.Thornton
Optimize Pak file indices by computing the PathHashIndex in unrealpak rather than using strings at runtime.
This also removes the need to shrink the string indices for performance, which was triggering a bug due to unsynchronized multithreaded access.

#ROBOMERGE-SOURCE: CL 11442058 in //Fortnite/Release-12.00/... via CL 11442063 via CL 11442073 via CL 11442081

[CL 11443295 by Matt Peters in Main branch]
2020-02-14 09:53:05 -05:00