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
sebastian nordgren
04bae252dd
Material lists now correctly display the reset to default button on the right.
...
SObjectPropertyEntryBox no longer has a CustomResetToDefault argument that was being ignored. Instead, all uses of it now directly use the FDetailWidgetRow OverrideResetToDefault().
#rb lauren.barnes
[CL 14444450 by sebastian nordgren in ue5-main branch]
2020-10-08 03:21:36 -04:00
ryan durand
627baf970a
Updating copyright for Engine Editor.
...
#rnx
#rb none
#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)
[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00
Chris Gagnon
8ab0638182
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.24
...
#rb none
[CL 9325047 by Chris Gagnon in Main branch]
2019-10-01 20:41:42 -04:00
lauren barnes
25e71b3717
Curve atlas parameters now filter out curves that aren't in the current atlas.
...
#jira UE-73129
#rb none
#rnx
#ROBOMERGE-SOURCE: CL 8639261 via CL 8651346
#ROBOMERGE-BOT: (v412-8640799)
[CL 8651500 by lauren barnes in Main branch]
2019-09-12 02:26:38 -04:00
Chris Gagnon
2e87118a18
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24.
...
#rb none
[CL 8614014 by Chris Gagnon in Main branch]
2019-09-10 11:35:20 -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
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
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
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
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
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
Lauren Ridge
4503b0eabe
Lightmass settings now display in the same override style as the rest of the material instance properties. Base properties are read from parent on load if they are not overwritten.
...
#rb trivial
[CL 4372818 by Lauren Ridge in Dev-Editor branch]
2018-09-18 10:19:24 -04:00
Lauren Ridge
dfbe92ae20
Hiding Show Modified Properties and adding custom Show Overridden Parameters in Material Instance editor. This works for all parameters and needs additional work for general properties (Physical Material, etc.).
...
#jira UE-63896
#rb Chris.Gagnon
#fyi Michael.Noland
[CL 4370634 by Lauren Ridge in Dev-Editor branch]
2018-09-17 16:52:32 -04:00