Commit Graph

64 Commits

Author SHA1 Message Date
Lauren Barnes
56d0bc8a62 The Material Parameters list now updates when parameters are hooked up.
#jira UE-79920
#rb none

[CL 8658410 by Lauren Barnes in Dev-Editor branch]
2019-09-12 14:13:57 -04:00
Chris Gagnon
8388cba784 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) prep for copy up.
#rb none

[CL 8573147 by Chris Gagnon in Dev-Editor branch]
2019-09-09 11:59:53 -04:00
jeremy moore
ba2c07876c Edition support for RVT parameters
#ROBOMERGE-SOURCE: CL 8562097 via CL 8563573
#ROBOMERGE-BOT: (v406-8472469)

[CL 8563703 by jeremy moore in Main branch]
2019-09-06 19:47:59 -04:00
Max Chen
e4d4965491 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 7774443 by Max Chen in Dev-Editor branch]
2019-08-05 15:48:51 -04:00
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
Max Chen
4561801a81 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) @7119039
#rb none

[CL 7120528 by Max Chen in Dev-Editor branch]
2019-06-21 01:21:43 -04:00
Lauren Ridge
8f606acbfa You can now use the advanced property Channel Names to label the R, G, B and A outputs of texture and vector parameters. These names will be visible in the material instance editor for instances of this material, as well as next to the pins for this expression.
#jira UE-62642
#rb Matt.Kuhlenschmidt

[CL 7095148 by Lauren Ridge in Dev-Editor branch]
2019-06-19 13:31:24 -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
Chris Gagnon
9f1505e469 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6671275 by Chris Gagnon in Dev-Editor branch]
2019-05-29 20:48:56 -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
Chris Gagnon
812b127109 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6525730 by Chris Gagnon in Dev-Editor branch]
2019-05-15 19:27:16 -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
Chris Gagnon
56e73ed431 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6042607 by Chris Gagnon in Dev-Editor branch]
2019-04-22 18:56:08 -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
lauren ridge
df20b03ef0 Adding a parameter's source function or material to its tooltip
#rb Chris.Bunner
#rnx


#ROBOMERGE-SOURCE: CL 5360370 via CL 5361077

[CL 5362013 by lauren ridge in Main branch]
2019-03-11 15:19:32 -04:00
Lauren Ridge
f17272c05e Adding a parameter's source function or material to its tooltip
#jira none
#rb Chris.Bunner

[CL 5360379 by Lauren Ridge in Dev-Editor branch]
2019-03-11 12:31:15 -04:00
Marcus Wassmer
6995e20184 Merging //UE4/Dev-Main@4848702 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
#lockdown rolando.caloca

[CL 4854488 by Marcus Wassmer in Dev-Rendering branch]
2019-01-30 20:34:55 -05:00
Lauren Ridge
37d54cef41 Adding a custom reset to default for refraction depth bias
#jira UE-68873
#rb none
#lockdown Chris.Gagnon

[CL 4783915 by Lauren Ridge in Dev-Editor branch]
2019-01-23 11:51:56 -05:00
Lauren Ridge
307d9e8877 Reset to default now handles base properties and lightmass properties correctly
#jira UE-63083
#rb Chris.Bunner

[CL 4744305 by Lauren Ridge in Dev-Editor branch]
2019-01-17 12:59:56 -05:00
Marcus Wassmer
a8d6cc952b Merging //UE4/Dev-Main@4700769 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4729861 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:04:38 -05:00
Chris Gagnon
1a3bf5caf1 Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813
#rb none

[CL 4720826 by Chris Gagnon in Dev-Editor branch]
2019-01-14 16:55:55 -05:00
Marcus Wassmer
cbfcbbb93b Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
Should be just copyright updates

[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
2019-01-03 19:16:26 -05:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Marcus Wassmer
c56a69a8c0 Merging //UE4/Dev-Main@4567547 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4568017 by Marcus Wassmer in Dev-Rendering branch]
2018-11-14 21:37:16 -05:00
Lauren Ridge
39245190f0 Adding uint32<->bool casts
#jira none
#rb Chris.Gagnon

[CL 4379665 by Lauren Ridge in Dev-Editor branch]
2018-09-19 18:16:36 -04:00