Commit Graph

242 Commits

Author SHA1 Message Date
kevin ortegren
73961aeb42 Adding a "Preview Blend Mode" on material functions that allows you to modifying the blend mode of the preview material. This is saved off on the material function so that artists can pick what they'd prefer the default preview behavior to be.
Contributed by The Coalition

#rb ben.ingram
#jira none

#ROBOMERGE-SOURCE: CL 16347000 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v804-16311228)

[CL 16347005 by kevin ortegren in ue5-release-engine-test branch]
2021-05-17 06:46:40 -04:00
Lauren Barnes
39f1923ed0 Deprecating .Icon() as a slate attribute on SDockTab. By default, tab icons fall back to using the one for the tab spawner's menu item. SetTabIcon can be used in the edge cases where an icon needs to be set that doesn't match the default. Updating all found cases of .Icon() usage on SDockTab.
#jira UETOOL-3429
#preflight 60996a2bdd2e00000126ff25
#rb Matt.Kuhlenschmidt

[CL 16251489 by Lauren Barnes in ue5-main branch]
2021-05-10 14:19:15 -04:00
christopher waters
688c029803 Tessellation Removal: Removing Tessellation specific material parameters.
#jira UE-94564
#rb ben.ingram, sebastien.hillaire, arciel.rekman, jason.nadro
#preflight 6078b15161a9060001161a4c

[CL 16034000 by christopher waters in ue5-main branch]
2021-04-16 10:46:28 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
Jason Nadro
336216390d Only display the strata material description if it exists.
#rb sebastien.hillaire
#review @sebastien.hillaire
#jira none

[CL 15823401 by Jason Nadro in ue5-main branch]
2021-03-25 10:40:27 -04:00
Sebastien Hillaire
c10078a527 Fix for preview to not try output Strata type.
#rb Rune.Stubbe

[CL 15797843 by Sebastien Hillaire in ue5-main branch]
2021-03-24 09:38:42 -04:00
lauren barnes
14cab89ad7 Fix for Hide Unused Connectors always resetting to true.
#rb trivial
#jira none

#ROBOMERGE-SOURCE: CL 15589105 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v777-15581079)

[CL 15589109 by lauren barnes in ue5-main branch]
2021-03-03 19:01:19 -04:00
jason nadro
30fa5748df Adding shader count statistic in the material editor. This reports the number of shaders that are in the material's shader maps by calling GetShaderNum().
#rb Arciel.Rekman, Ben.Ingram
[at]Arciel.Rekman, [at]Ben.Ingram
#jira none

#ROBOMERGE-SOURCE: CL 15587074 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v777-15581079)

[CL 15587092 by jason nadro in ue5-main branch]
2021-03-03 16:24:00 -04:00
lauren barnes
aa8befd2a2 Fix for Hide Unrelated Connectors defaulting to on
#jira none
#rb Matt.Kuhlenschmidt+

#ROBOMERGE-SOURCE: CL 15560866 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15560944 by lauren barnes in ue5-main branch]
2021-03-01 15:56:39 -04:00
lauren barnes
3553779a26 Material and Material Instance editors update v1.0
#jira UETOOL-2624
#jira UETOOL-2623
#rb Louise.Rasmussen

#ROBOMERGE-SOURCE: CL 15528734 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15528756 by lauren barnes in ue5-main branch]
2021-02-25 11:30:03 -04:00
lauren barnes
73f5d201b3 Material Editor Cleanup Pass
#rb Matt.Kuhlenschmidt
#jira UE-104842

#ROBOMERGE-SOURCE: CL 15421050 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15421081 by lauren barnes in ue5-main branch]
2021-02-16 15:32:34 -04:00
Ben Ingram
bf90b91344 Add new type FExpressionExecOutput to represent UMaterialExpression execution outputs
- Previously exec inputs/outputs were stored along with other (data) inputs/outpus
- Problem is, for exec pins, we want each output to only support 1 connection, but multiple connections to each input. This is the opposite of data, where we support multiple output connections, but only 1 input connection
- So we flip the representation around, and store output pointers, rather than input pointers...this also better matches the way we iterate exec connections while compiling
- This does complicate some UI logic, as now input/output graph pins no longer line up exeactly with UMaterialExpression inputs/outputs (we still have a flat list of pins, but separate lists of exec/non-exec inputs/outputs)
#jira none
#rb lauren.barnes

[CL 15361599 by Ben Ingram in ue5-main branch]
2021-02-08 18:55:31 -04:00
Zousar Shaker
12d60feecc Bulk pass to address PVS warnings due to use of a TObjectPtr in the result clauses of a ternary operator.
#jira UE-107532
#jira UE-107530
#rb none

[CL 15276391 by Zousar Shaker in ue5-main branch]
2021-02-01 19:17:54 -04:00
Ben Ingram
a557c4be0e Add experimental support for material control flow (if-statement, for-loop, local variables)
- Very WIP, not intended/ready for production use
- Hidden behind CVAR to enable support, and per-material flag to opt in
#jira none
#rb rune.stubbe

[CL 15251606 by Ben Ingram in ue5-main branch]
2021-01-28 17:48:58 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
Zousar Shaker
fc2ad21a5e Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr)
Call-site changes for non-scalar wrapped object pointer upgrades in Engine + Shootergame

#rb devin.doucette

[CL 14996467 by Zousar Shaker in ue5-main branch]
2021-01-05 19:16:25 -04:00
Marc Audy
ada7c144fa Merge //UE5/Release-Engine-Staging @14903491 to //UE5/Main
[CL 14906022 by Marc Audy in ue5-main branch]
2020-12-11 14:21:20 -04:00
Sebastien Hillaire
a1da4cbb7d Fixed blending of mateiral layers when strata is not used (default material code chunk needs to be registered too).
#review-14815951 @Charles.deRousiers
#fyi jonathan.litt

[CL 14815949 by Sebastien Hillaire in ue5-main branch]
2020-11-26 11:05:23 -04:00
sebastian nordgren
c678b96a4b FDetailsViewArgs 8 parameter defaulted constructor deprecated and all usages fixed.
#rb lauren.barnes

[CL 14750682 by sebastian nordgren in ue5-main branch]
2020-11-16 08:16:15 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -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
Sebastien Hillaire
ca842c6389 Added strata material description into output stat.
Strata material compiler general improvements.
- Created a headers shared between code and shaders
- Build up an internal representation of the material layer (BSDF horizontal mixing per layer)
- Output more meaningful errors for the user to understand what is wrong if using too many BSDFs or layers, etc. (exemple Adding would result in too many BSDFs in a Layer) Important if artist start to use what we currently have to not have them whaste time.
- Add a debug as text in the hlsl code showing the material setup as well as in the material compilation stats.

This later will open other possibility: shared normal cache between layers or per material max byte count instead of max BSDF count.

#rb Charles.deRousiers

[CL 14513400 by Sebastien Hillaire in ue5-main branch]
2020-10-19 08:23:06 -04:00
daren cheng
b97f3074ce Fix issue where it was possible to shift-click to open existing tabs on top of each other in material editor.
#jira UE-100606
#rb none

[CL 14476830 by daren cheng in ue5-main branch]
2020-10-12 20:52:33 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
Sebastien Hillaire
8428b0ea62 Strata material graph, new pin type representing the mixed and layered BSDF.
Very basic and lots of things are missing but it is tracked.

#rb Charles.deRousiers

[CL 14444435 by Sebastien Hillaire in ue5-main branch]
2020-10-08 03:11:37 -04:00