Commit Graph

49009 Commits

Author SHA1 Message Date
keli hlodversson
d36581b774 Manually merging CL#5261568 using Main_To_Release-4.22 due to conflict in RoboMerge
Don't wait indefinitely for a native window in Daydream if the application is exiting.
Fixes a bug that leaves a defunct process when dismissing the dialog to put the phone in the daydream headset preventing the application from being launched without killing it first.
#jira  UE-46640
#rb Chris.Babcock

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: keli.hlodversson
#ROBOMERGE-SOURCE: CL 5261967 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5268606 by keli hlodversson in Dev-Build branch]
2019-03-01 15:16:03 -05:00
marc audy
b18ba7c5be Remove unused macros
#jira
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 5261305 via CL 5261306 via CL 5261836 via CL 5261852
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5268486 by marc audy in Dev-Build branch]
2019-03-01 15:15:25 -05:00
peter knepley
5cb28f02ef Fix build
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: peter.knepley
#ROBOMERGE-SOURCE: CL 5261208 via CL 5261209 via CL 5261473 via CL 5261574
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5268349 by peter knepley in Dev-Build branch]
2019-03-01 15:14:43 -05:00
richard wallis
0bf58b803d Address PSO compile failures by marking the PSO as invalid in the PipelineCache file meta data and don't return them as part of GetOrderedPSOHashes().
This change add an extra engine flag field in the meta data that we can now use for marking other features during runtime.  Any PSO's marked as invalid won't get processed as part of the ShaderPipelineCache commandlet processing, that is Build and Expand commands will skip these entries.

#rb mark.satterthwaite

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: richard.wallis
#ROBOMERGE-SOURCE: CL 5260815 via CL 5260817 via CL 5261354 via CL 5261486
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5268005 by richard wallis in Dev-Build branch]
2019-03-01 15:13:13 -05:00
ben marsh
c4f107b23f Push/pop TRUE and FALSE macros between PreWindowsApi.h and PostWindowsApi.h, since they are sometimes also defined by third party libraries.
#rb none
#jira UE-70384
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5261011 in //UE4/Release-4.22/... via CL 5261012
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267979 by ben marsh in Dev-Build branch]
2019-03-01 15:13:06 -05:00
thomas sarkanen
4daf44430c Fixed crash reordering a preview mesh collection from inside an animation editor
#jira UE-67791 - Crash attempting to reorder a Preview Mesh Collection array within the Animation Editor - Assertion failed: IsValid() in SharedPointer.h at Line 849
#rb Jurre.deBaare

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 5260852 in //UE4/Release-4.22/... via CL 5260857
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267969 by thomas sarkanen in Dev-Build branch]
2019-03-01 15:13:03 -05:00
thomas sarkanen
d63e64a6db Fixed crash undoing the renaming of a deleted animation curve
#jira UE-69655 - Crash undoing the renaming of an Animation Curve that had been deleted - Assertion failed: (Index >= 0) & (Index < ArrayNum) in Array.h Line 611
#rb Jurre.deBaare

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 5260850 in //UE4/Release-4.22/... via CL 5260853
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267959 by thomas sarkanen in Dev-Build branch]
2019-03-01 15:13:02 -05:00
thomas sarkanen
8432fd7648 Fixed crash converting a sequencer posessed actor to spawnable when it uses the rigid body anim node
#jira UE-68762 - Convert CharacterBP to Spawnable in Sequencer cause crash
#rb Jurre.deBaare

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 5260848 in //UE4/Release-4.22/... via CL 5260849
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267952 by thomas sarkanen in Dev-Build branch]
2019-03-01 15:13:00 -05:00
chris varnsverry
52b2ba1397 Add CallStats callback to IVoiceChat, and Vivox implementation
[at]michael.kirzinger

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.varnsverry
#ROBOMERGE-SOURCE: CL 5260676 via CL 5260679 via CL 5260756 via CL 5260770
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267903 by chris varnsverry in Dev-Build branch]
2019-03-01 15:12:49 -05:00
rob gay
49c29e2ffb Missing }
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: rob.gay
#ROBOMERGE-SOURCE: CL 5259574 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267510 by rob gay in Dev-Build branch]
2019-03-01 15:09:49 -05:00
rob gay
7a63543edf Fix merge conflict (again) #rb none #jira none #okforgithub public
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: rob.gay
#ROBOMERGE-SOURCE: CL 5259566 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267501 by rob gay in Dev-Build branch]
2019-03-01 15:09:48 -05:00
rob gay
19a2412f3d Fix compile error
#rb john.white

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: rob.gay
#ROBOMERGE-SOURCE: CL 5259258 via CL 5259420 via CL 5259547
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267412 by rob gay in Dev-Build branch]
2019-03-01 15:09:08 -05:00
ben marsh
d45b863414 Fix warning when generating project files in a minimal workspace (due to no documentation folder).
#rb none
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5259512 in //UE4/Release-4.22/... via CL 5259514
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267396 by ben marsh in Dev-Build branch]
2019-03-01 15:09:05 -05:00
tim tillotson
e5e6f664bf Allow reloading asset redirectors at runtime when they are updated via hotfix.
[at]Josh.May [at]Bob.Tellez [at]Eric.Knapik

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: tim.tillotson
#ROBOMERGE-SOURCE: CL 5259115 via CL 5259116 via CL 5259252 via CL 5259255 via CL 5259416 via CL 5259448
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267389 by tim tillotson in Dev-Build branch]
2019-03-01 15:09:03 -05:00
zabir hoque
4af40590c9 Remove redefinition of log category that is included via PCH to fix build break.
#Jira: none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: zabir.hoque
#ROBOMERGE-SOURCE: CL 5259146 via CL 5259150 via CL 5259312 via CL 5259329
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267294 by zabir hoque in Dev-Build branch]
2019-03-01 15:08:40 -05:00
zabir hoque
9c9b6fc502 Enable stencil testing for post process materials.
- Write directly to post process input 0 if able.
  - Copy post process input 0 to target if unable.
  - Allow SM4 to make copy DS if necessay.
  - Allow PPM to use blend modes to composite onto output.

#rb: Brian.Karis
#Jira: FORT-150303

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: zabir.hoque
#ROBOMERGE-SOURCE: CL 5259065 via CL 5259067 via CL 5259304 via CL 5259305
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267253 by zabir hoque in Dev-Build branch]
2019-03-01 15:08:31 -05:00
aaron mcleran
40162ac21d Fix for hang in audio mixer during flush.
- Fix removes unnecessary bool to flag requiring a flush.
- Cleans up command queue swap.
- Switches to using a manual-reset Event to prevent hangs.

#rb Ethan.Geller, Zabir.Hoque, Ben.Woodhouse

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: aaron.mcleran
#ROBOMERGE-SOURCE: CL 5258922 via CL 5258923 via CL 5259048 via CL 5259053
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5267210 by aaron mcleran in Dev-Build branch]
2019-03-01 15:08:20 -05:00
jack porter
86c0e71dbf Fix black screen after splash when not using startup movie or early preload screen
Repplying fix from CL 5257895 in Release-4.22
#jira UE-69985
#rb Thomas.Ross
#lockdown: Nick.Penwarden

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 5258930 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5266839 by jack porter in Dev-Build branch]
2019-03-01 15:06:31 -05:00
joe conley
65ca1d3814 #jira UE-70844 Crash on Lumin with desktop rendering in TM-Shadermodels
#rb Ryan.Vance
[FYI] Rolando.Caloca

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: joe.conley
#ROBOMERGE-SOURCE: CL 5258644 in //UE4/Release-4.22/... via CL 5258674
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5266640 by joe conley in Dev-Build branch]
2019-03-01 15:04:25 -05:00
phillip kavan
e35d3b528c Fix replication of a child actor component's internal archetype object when both the archetype and the outer Blueprint class are both nativized.
#jira UE-70467
#rb Dan.OConnor

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: phillip.kavan
#ROBOMERGE-SOURCE: CL 5257952 in //UE4/Release-4.22/... via CL 5258672
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5266639 by phillip kavan in Dev-Build branch]
2019-03-01 15:04:22 -05:00
arne schober
e96d90a9aa MN - Fix serialization of inline cooked materials
#jira UE-69546
#RB Uriel.Doyon, Robert.Manuszewski

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: arne.schober
#ROBOMERGE-SOURCE: CL 5257884 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5265967 by arne schober in Dev-Build branch]
2019-03-01 15:00:58 -05:00
ben marsh
fdbc727716 Use scoped Windows TRUE and FALSE constants.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5257396 in //UE4/Release-4.22/... via CL 5257411
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5265957 by ben marsh in Dev-Build branch]
2019-03-01 15:00:56 -05:00
dan oconnor
9f16d2cfd2 Fixed compilation error describing undetermined type when calling an interface function with Set or Map properties
#rb Phillip.Kavan
#jira UE-70642

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: dan.oconnor
#ROBOMERGE-SOURCE: CL 5247777 in //UE4/Release-4.22/... via CL 5247868
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5264922 by dan oconnor in Dev-Build branch]
2019-03-01 14:56:06 -05:00
ryan vance
c3ff86e939 #jira UE-70166
#rb none
Re-enabling ML by default now that the ZI crash has been resolved.

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ryan.vance
#ROBOMERGE-SOURCE: CL 5247187 in //UE4/Release-4.22/... via CL 5247260
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5264912 by ryan vance in Dev-Build branch]
2019-03-01 14:56:05 -05:00
daniel wright
0030df244e Fixed bSetupResourceClusters only getting reset if there was valid lighting in the map build data.
#rb none
#jira UE-70720

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: daniel.wright
#ROBOMERGE-SOURCE: CL 5247082 in //UE4/Release-4.22/... via CL 5247142
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5264905 by daniel wright in Dev-Build branch]
2019-03-01 14:56:03 -05:00