lauren ridge
dff26797bc
Fix for material instance with no parent being opened for edit
...
#jira UE-77671
#rb copiedCL
#rnx
#ROBOMERGE-OWNER: lauren.ridge
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 7476839 via CL 7492270 via CL 7544868
#ROBOMERGE-BOT: (v372-7473910)
[CL 7544873 by lauren ridge in Main branch]
2019-07-23 10:45:09 -04:00
lauren ridge
9abb5931e2
Adding default text in case a parent material isn't found
...
#jira UE-77421
#rb trivial
#ROBOMERGE-SOURCE: CL 7427308 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)
[CL 7427321 by lauren ridge in Main branch]
2019-07-17 14:56:36 -04:00
sebastien lussier
0839438169
Improved the assignation of UV slots for custom interpolators.
...
- Now reusing unused slots instead of simply adding them after the last used slot.
- Added missing calls to GatherExpressionsForCustomInterpolators()
#rb chris.bunner, jurre.debaare
#ROBOMERGE-OWNER: sebastien.lussier
#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 7321118 via CL 7321791
#ROBOMERGE-BOT: (v371-7306989)
[CL 7321793 by sebastien lussier in Main branch]
2019-07-16 09:48:17 -04:00
jack porter
a913c14fcc
Apply platform scalability settings when changing Preview Rendering Level
...
#rb Allan.Bentham
[CODEREVIEW] Jack.Porter, Rolando.Caloca, Josh.Adams
#ROBOMERGE-OWNER: jack.porter
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 7306462
2019-07-16 01:31:34 -04:00
sebastien lussier
ab0f0c0bfd
Backout CL 7226803 as some issues have been reported with Slate.
...
#rnx none
#rb marcus.wassmer
#ROBOMERGE-OWNER: sebastien.lussier
#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 7228296 via CL 7231754
#ROBOMERGE-BOT: (v367-6836689)
[CL 7231779 by sebastien lussier in Main branch]
2019-07-08 14:42:08 -04:00
lauren ridge
20df4e2412
Tweak to previous menu fix
...
#rb trivial
#jira trivial
#ROBOMERGE-SOURCE: CL 7228198 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)
[CL 7228202 by lauren ridge in Main branch]
2019-07-08 12:15:29 -04:00
lauren ridge
52c36a5737
Fix for assert for missing EndSection call
...
#jira none
#rb Rex.Hill
#ROBOMERGE-SOURCE: CL 7228185 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)
[CL 7228186 by lauren ridge in Main branch]
2019-07-08 12:11:54 -04:00
sebastien lussier
3ffe2a8e6b
Improved the assignation of UV slots for custom interpolators.
...
- Now reusing unused slots instead of simply adding them after the last used slot.
- Also added missing calls to GatherExpressionsForCustomInterpolators()
#rb chris.bunner, jurre.debaare
#ROBOMERGE-OWNER: sebastien.lussier
#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 7226803 via CL 7227156
#ROBOMERGE-BOT: (v367-6836689)
[CL 7227160 by sebastien lussier in Main branch]
2019-07-08 09:42:23 -04:00
uriel doyon
fbeabd378c
Removed unrequired shader compilation when changing preview feature level.
...
Texture streaming accuracy visualization now show the current state of data, and doesn't need to build the texture streaming as a prestep.
#rb alexis.matte
#jira UE-76859
#ROBOMERGE-SOURCE: CL 7223779 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)
[CL 7223780 by uriel doyon in Main branch]
2019-07-04 13:00:49 -04:00
lauren ridge
b8f4f124ea
Hiding material hierarchy in the material editor if editing a function, adding a "no instances found" item if there are no material instances
...
#jira UE-76656
#jira UE-76657
#rb trivial
#ROBOMERGE-SOURCE: CL 7110665 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)
[CL 7110681 by lauren ridge in Main branch]
2019-06-20 15:43:10 -04:00
lauren ridge
3de8bb78be
Fixing Atlas Curve expression to use parameters so it handles atlas resizing correctly
...
#rb Chris.Bunner
#rnx
[FYI] Marcus.Wassmer, Bryan.Rathman
#ROBOMERGE-OWNER: lauren.ridge
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 7068709 via CL 7102336
#ROBOMERGE-BOT: (v367-6836689)
[CL 7102359 by lauren ridge in Main branch]
2019-06-20 10:20:00 -04:00
rob gay
e7cc7cf9ed
Minor fix to material editor alignment shortcut
...
#rb none
#ROBOMERGE-SOURCE: CL 6956868 via CL 6958242
#ROBOMERGE-BOT: (v367-6836689)
[CL 6971320 by rob gay in Main branch]
2019-06-13 12:01:30 -04:00
Rolando Caloca
aa0d2303d6
Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
...
#rb none
#rnx
[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
kevin ortegren
454902f20b
Now support static switches, quality switches and feature switches for the Shading Model from Material Expression. Done by collecting the shading models used during material translation.
...
#rb none
[FYI] chris.bunner
#rnx
#ROBOMERGE-SOURCE: CL 6894721 via CL 6903921
#ROBOMERGE-BOT: (v366-6836689)
[CL 6904070 by kevin ortegren in Main branch]
2019-06-08 23:02:14 -04:00
lauren ridge
eca34bf106
Adding Material Editing Library script-callable functions to find the source of parameters (ie did they originate in the material itself or a nested function)
...
#jira UE-75211
#rb Rex.Hill
#rnx
#ROBOMERGE-SOURCE: CL 6894712 via CL 6903914
#ROBOMERGE-BOT: (v366-6836689)
[CL 6904062 by lauren ridge in Main branch]
2019-06-08 23:02:09 -04:00
lauren ridge
55ba4f6f2e
Adding getters for the material parameter names to the Material Editing Library
...
#jira UE-75716
#rb Jason.Stasik
#rnx
#ROBOMERGE-SOURCE: CL 6867297 via CL 6868764
#ROBOMERGE-BOT: (v366-6836689)
[CL 6868826 by lauren ridge in Main branch]
2019-06-06 17:47:54 -04:00
lauren ridge
e685c6e559
Adding hierarchy button to material editor toolbar to show material instances and added children to material instance editor hierarchy dropdown
...
#jira UE-51194
#rb Chris.Gagnon
#rnx
#ROBOMERGE-SOURCE: CL 6861488 via CL 6863501
#ROBOMERGE-BOT: (v366-6836689)
[CL 6864511 by lauren ridge in Main branch]
2019-06-06 14:23:02 -04:00
lauren ridge
743db79b8e
Adding a function to the Material Editing Library to get children of any material or material instance.
...
#jira UE-75211
#rb Rex.Hill
#rnx
#ROBOMERGE-SOURCE: CL 6853079 via CL 6854143
#ROBOMERGE-BOT: (v366-6836689)
[CL 6854160 by lauren ridge in Main branch]
2019-06-05 15:16:21 -04:00
lauren ridge
9cfc46b1f6
Adding functionality to MaterialEditingLibrary. Get Static Switch Parameter Value, plus matching Get X Parameter Value functions for Materials (for scalar, vector, texture, and static switch). Also added a getter to check material usage flags.
...
#jira UE-75211
#rb Alexander.Sanoja
#rnx
#ROBOMERGE-SOURCE: CL 6837755 via CL 6840221
#ROBOMERGE-BOT: (v366-6836689)
[CL 6841288 by lauren ridge in Main branch]
2019-06-04 18:26:36 -04:00
Chris Gagnon
930e33cb48
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
...
#rb none
[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
kevin ortegren
ea9572ce76
Now treating the subsurface profile override like the other material override poroperties in the Material Instance editor UI
...
#rb none
[FYI] Lauren.Ridge
#ROBOMERGE-SOURCE: CL 6629070 via CL 6632166
#ROBOMERGE-BOT: (vundefined-6620334)
[CL 6632349 by kevin ortegren in Main branch]
2019-05-24 13:21:14 -04:00
Ben Marsh
0cc6e3dca6
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
...
#rb none
#rnx
[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
kevin ortegren
6e86d755db
Some UI improvements to matrerial scalar/vector parameters when using the custom primitive data.
...
Added a debug string field to display all the shading models in a material in UMaterial, this is displayed only when "From Material Expression" is the selected shading model on the material.
#rb none
#rnx
#ROBOMERGE-SOURCE: CL 6604268 via CL 6604783
#ROBOMERGE-BOT: (v351-6581450)
[CL 6604810 by kevin ortegren in Main branch]
2019-05-22 10:27:49 -04:00
kevin ortegren
c92b1c86d9
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: kevin.ortegren
#ROBOMERGE-AUTHOR: kevin.ortegren
#ROBOMERGE-SOURCE: CL 6308573 via CL 6309266
[CL 6315508 by kevin ortegren in Main branch]
2019-05-06 06:04:18 -04:00
lauren ridge
c3ec4df956
Fixed crash in case of material instance with no parent looking for parent values
...
#jira UE-72205
#rb Jason.Stasik
#lockdown Cristina.Riveron
#ROBOMERGE-SOURCE: CL 5690030 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 5711349 by lauren ridge in Main branch]
2019-04-03 13:30:43 -04:00
