Commit Graph

351 Commits

Author SHA1 Message Date
joe conley
c5e44d055f Adds support for multiple shading models per material. Each material now has a bit field of which shading models it is using. Shading models for a material are selected through a new Shading Model material expression, which can be connected to the new Shading Model material output pin. This is opt-in by selecting "From Material Expression" in the Shading Model drop down on the material. With no changes, everything should behave like before, and the old workflow is still there. Optimized shader code should be as performant as before if not using more than one shading model.
[FYI] Chris.Bunner, Krzysztof.Narkowicz, Marcus.Wassmer, Yuriy.Odonnell, Matt.Kuhlenschmidt
#rb Krzysztof.Narkowicz

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: kevin.ortegren
#ROBOMERGE-SOURCE: CL 6308573 via CL 6309266 via CL 6315508
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6348696 by joe conley in Dev-VR branch]
2019-05-07 17:16:40 -04:00
richard malo
16392a0f14 - Fixed invalid errors when generating a Landscape LOD with Create Package Per Asset enabled after generating with it disabled
- Caused by Asset Registry not in sync (race condition between Directory Watcher and Validation Manager)
#jira UE-71671
#rb jeanfrancois.dube

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 5831518 via CL 5835452 via CL 5836260
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5877724 by richard malo in Dev-VR branch]
2019-04-12 21:17:51 -04:00
mickael gilabert
0a8e57b121 Fixed plugins build
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: mickael.gilabert
#ROBOMERGE-SOURCE: CL 5820932 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5858154 by mickael gilabert in Dev-VR branch]
2019-04-12 13:59:29 -04:00
lauren ridge
f2076e926d Blutility updates to add more generic base classes and libraries for editor scripting
#rb Chris.Gagnon
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 5808467 via CL 5811585 via CL 5811826
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5841149 by lauren ridge in Dev-VR branch]
2019-04-12 12:56:41 -04:00
pj kack
b21c5947b5 Back out integrated changelist 5586728 (5571078) to resubmit all cook -iterate optimizations implemented on //UE4/Dev-core/... (see 5533504)
New AssetRegistryState::InitializeFromExistingAndPrune temporarily disabled until some bugs have been fixed.

Test Scenario:
1) BuildCookStageAndRun with these arguments: -platform=Win64 -configuration=Development
2) CookIterate with these arguments: -run=Cook -CookCultures=en -TargetPlatform=WindowsClient -unversioned -stdout -unattended -iterate

Wall Time Results (as an average of running step 2) two times):
Before: ~09:40 (580 seconds) cook commandlet time
After: ~02:30 (150 seconds) cook commandlet time
=> 07:10 (430 seconds ) faster, i.e. a ~ 3.9x speedup

Win32 FileSystem Results:
Before: 1.5 million GetFileAttribute calls and 1.2 million FindNextFile calls
After: 35 0000 GetFileAttribute calls and 1.6 million FindNextFile calls
=> ~400 000 calls to FindNextFile replaces ~1.5 million calls to GetFileAttribute

#rb none


(peafour-cherrypick of //UE4/Dev-Core/[at]5645695 by PJ.Kack)

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: pj.kack
#ROBOMERGE-SOURCE: CL 5533504 via CL 5533655 via CL 5536177 via CL 5772728 via CL 5772753 via CL 5772793
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5787307 by pj kack in Dev-VR branch]
2019-04-08 14:08:44 -04:00
bob tellez
a3624c000c Back out changelist 5533504. Crash at startup on forking linux servers. (Missing referencer information)
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 5571078 via CL 5572105 via CL 5572109
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5586437 by bob tellez in Dev-VR branch]
2019-03-27 02:01:56 -04:00
pj kack
a255328cb8 Copying task stream Dev-cook to Main
Integrate all cook -iterate optimizations from //UE4/Dev-core/...

Test Scenario:
1) BuildCookStageAndRun with these arguments: -platform=Win64 -configuration=Development
2) CookIterate with these arguments: -run=Cook -CookCultures=en -TargetPlatform=WindowsClient -unversioned -stdout -unattended -iterate

Wall Time Results (as an average of running step 2) two times):
Before: ~09:40 (580 seconds) cook commandlet time
After: ~02:30 (150 seconds) cook commandlet time
=> 07:10 (430 seconds ) faster, i.e. a ~ 3.9x speedup

Win32 FileSystem Results:
Before: 1.5 million GetFileAttribute calls and 1.2 million FindNextFile calls
After: 35 0000 GetFileAttribute calls and 1.6 million FindNextFile calls
=> ~400 000 calls to FindNextFile replaces ~1.5 million calls to GetFileAttribute

#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: pj.kack
#ROBOMERGE-SOURCE: CL 5533504 via CL 5533655 via CL 5536177
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5546459 by pj kack in Dev-VR branch]
2019-03-25 17:48:25 -04:00
graeme thornton
f9123f5f24 Created a new interface to RSA functionality that is independent of key size (unlike the old TBigInt version). Internally, RSA functions are implemented by OpenSSL on Windows/Mac/Linux an falling back to the TBigInt implementation for other platforms
- Future plan would be not to use OpenSSL directly, but to go via PlatformCrypto or something like it which could provide platform specific RSA functionality if it exists
- Also contains some compensation code for platforms that are still stuck on an older version of OpenSSL (everything except windows)
- On platforms that use OpenSSL < 1.1.1, register a locking callback so we can provide mutexes and stop it crashing horribly when the same RSA key is used concurrently on different threads

Changed default key size in the CryptoKeys plugin to 4096 bits.

#jira UE-71377
#rb ian.fox, robert.manuszewski, ryan.gerleve

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 5447433 in //UE4/Release-4.22/... via CL 5447485
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5447722 by graeme thornton in Dev-VR branch]
2019-03-19 09:01:04 -04:00
Ryan Vance
35eb0041ab Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 5387703 by Ryan Vance in Dev-VR branch]
2019-03-13 15:19:08 -04:00
martin wilson
68aef47729 Fix crash using the facial anim importer
#jira UE-70786
#rb Marc.Audy

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: martin.wilson
#ROBOMERGE-SOURCE: CL 5243035 in //UE4/Release-4.22/... via CL 5243037
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5265224 by martin wilson in Dev-VR branch]
2019-03-01 14:57:38 -05:00
jeanmichel dignard
8e55a09757 Copied fixes for MDL, AxF, GLTF and the Variants Manager: 5224459, 5196836, 5196494, 5060622, 4928742 from //Tasks/UE4/Private-Datasmith-Deltagen/
#jira UE-70647, UE-70609, UE-68436, UE-68600, UE-69048
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jeanmichel.dignard
#ROBOMERGE-SOURCE: CL 5241671 in //UE4/Release-4.22/... via CL 5241675
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5257579 by jeanmichel dignard in Dev-VR branch]
2019-02-28 18:47:39 -05:00
rob gay
b546cf2a25 Add to import process the ability to templatize for non-imported properties of USoundWaves from pre-existing USoundWave
#rb aaron.mcleran
#rb ethan.geller
#jira none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: rob.gay
#ROBOMERGE-SOURCE: CL 5237154 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5255087 by rob gay in Dev-VR branch]
2019-02-28 18:16:39 -05:00
josh adams
019c12863e - Merging Dev-Kairos/Engine/... to Main/Engine/...
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5244512 by josh adams in Dev-VR branch]
2019-02-28 17:06:02 -05:00
jeanmichel dignard
ab547e3454 Copied fixes for the GLTF importer: 4995596 & 5007731 & 4958599
Fixes crash on static mesh reimport and gltf coordinates issues

#jira UE-69569, UE-68329, UE-68840
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jeanmichel.dignard
#ROBOMERGE-SOURCE: CL 5009668 in //UE4/Release-4.22/... via CL 5009670
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5083168 by jeanmichel dignard in Dev-VR branch]
2019-02-19 19:17:06 -05:00
anousack kitisa
7c79265bbb Fixed local variable shadowing warning (Linux/Mac) from cl 4922582.
#jira UE-67692

#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: anousack.kitisa
#ROBOMERGE-SOURCE: CL 4924809 in //UE4/Release-4.22/... via CL 4924814
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5017432 by anousack kitisa in Dev-VR branch]
2019-02-16 01:20:46 -05:00
jeanmichel dignard
c1d7bb8b93 Copied 4.22 fixes for the MDL and GLTF importers
cl 4753660, 4753673, 4772807, 4773080, 4776806, 4821215, 4821216, 4821232, 4830162, 4830164, 4830882, 4899208

#jira UE-68437, UE-68672, UE-68674, UE-68031
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jeanmichel.dignard
#ROBOMERGE-SOURCE: CL 4924445 in //UE4/Release-4.22/... via CL 4924446
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5017421 by jeanmichel dignard in Dev-VR branch]
2019-02-16 01:20:36 -05:00
jeanluc corenthin
2eef2361b5 Copied CL #4791504 from //UE4/Dev-Enterprise/...
Reworked material substitution in data prep based on PF & Thomas' feedback
Removed SimplifyMeshes as required by PF & Thomas
Promoted EEditorScriptingStringMatchType as a Blueprint type
Delayed the load of the DataPrep BP template. Now loaded when needed. The BP will be loaded after all modules it may depend on are. Otherwise, the BP will be unusable.

#jira UEENT-2342
#rb jeanmichel.dignard

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jeanluc.corenthin
#ROBOMERGE-SOURCE: CL 4924401 in //UE4/Release-4.22/... via CL 4924405
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5017415 by jeanluc corenthin in Dev-VR branch]
2019-02-16 01:20:29 -05:00
jeanmichel dignard
29a182510d Fixed crash in GLTF importer due to a bad merge coming from dev-editor.
#jira UE-69524
#rb Johan.Duparc

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jeanmichel.dignard
#ROBOMERGE-SOURCE: CL 4923803 in //UE4/Release-4.22/... via CL 4923805
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5017386 by jeanmichel dignard in Dev-VR branch]
2019-02-16 01:20:06 -05:00
anousack kitisa
a827c75c24 Changed the "Flip Normals" operation to only reverse the normals/tangents and retriangulate instead of deleting/recreating the polygons and recomputing the normals/tangents.
Fixed some polygons didn't recompute their normals when "Unify Normals".

#jira UE-67692
#jira UE-64344

#rb JeanLuc.Corenthin, Johan.Duparc

[FYI] Mike.Fricker

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: anousack.kitisa
#ROBOMERGE-SOURCE: CL 4922582 in //UE4/Release-4.22/... via CL 4922584
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5016516 by anousack kitisa in Dev-VR branch]
2019-02-16 01:12:42 -05:00
Ryan Vance
b8f69c61f4 Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 4922272 by Ryan Vance in Dev-VR branch]
2019-02-06 13:27:58 -05:00
julien stjean
f3d7bfc1ae Merging 4811795 from Dev-Enterprise to Release-4.22
Fix Python crash in UEditorLevelLibrary::DestroyActor when using the Editor CMD.

#rb Patrick.Boutot
#jira UE-67306

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: julien.stjean
#ROBOMERGE-SOURCE: CL 4899267 in //UE4/Release-4.22/... via CL 4899270
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4913836 by julien stjean in Dev-VR branch]
2019-02-05 19:02:34 -05:00
jamie dale
b6b580db72 Guard against invalid array access in FindValidActorAndComponents
#jira UE-69165
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 4890544 in //UE4/Release-4.22/... via CL 4890545
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4890556 by jamie dale in Dev-VR branch]
2019-02-04 15:46:00 -05:00
michael kirzinger
2fa95114f0 Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main)
Source: //UE4/Dev-Online 4860295

#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.kirzinger
#ROBOMERGE-SOURCE: CL 4860323 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4860333 by michael kirzinger in Dev-VR branch]
2019-01-31 15:09:49 -05:00
marcus wassmer
b259f65406 Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4854553 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4854570 by marcus wassmer in Dev-VR branch]
2019-01-30 21:24:04 -05:00
chris gagnon
632b923945 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4837006 by chris gagnon in Dev-VR branch]
2019-01-29 19:23:19 -05:00