Commit Graph

399 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
Lauren Barnes
e0b5cc3589 Make sure we have material editor commands before trying to use them to create a node
#jira UE-80100
#rb trivial

[CL 8627850 by Lauren Barnes in Dev-Editor branch]
2019-09-10 17:39:18 -04:00
Lauren Barnes
20ed79f374 Fix for crash when renaming a material layer and then expanding the UI
#jira UE-79642
#rnx
#fyi Michal.Valient
#rb trivial

[CL 8615022 by Lauren Barnes in Dev-Editor branch]
2019-09-10 13:28:05 -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
nick darnell
d136c0604e Editor - The material thumbnail renderer no longer attempts to use an in world render to draw UI Materials, instead it uses the WidgetRenderer to draw the SlateMaterial like it would be for real. Unselecting the material in the material editor when changing materials.
Matt.Kuhlenschmidt, Vincent.Gauthier


#ROBOMERGE-OWNER: nick.darnell
#ROBOMERGE-AUTHOR: nick.darnell
#ROBOMERGE-SOURCE: CL 8568427 via CL 8568434 via CL 8568522
#ROBOMERGE-BOT: (v406-8472469)

[CL 8568569 by nick darnell in Main branch]
2019-09-07 20:48:56 -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
Chris Gagnon
6f65d35a7a Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) in prep for copy up
#rb none

[CL 8563299 by Chris Gagnon in Dev-Editor branch]
2019-09-06 19:11:19 -04:00
jeremy moore
bb630dc0f6 Add support to material interface for querying RVT paramters
Stubbed out material instance implementation for now
Use the new interface in RVT parameter material expressions


#ROBOMERGE-SOURCE: CL 8556897 via CL 8562562
#ROBOMERGE-BOT: (v406-8472469)

[CL 8562734 by jeremy moore in Main branch]
2019-09-06 18:57:30 -04:00
jeremy moore
ce28e6ae5c Support material expression convert from RVT Sample to RVT Parameter Sample
#ROBOMERGE-SOURCE: CL 8553659 via CL 8557636
#ROBOMERGE-BOT: (v406-8472469)

[CL 8557732 by jeremy moore in Main branch]
2019-09-06 16:34:44 -04:00
Max Chen
61603c83e4 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL#8390086
#rb none

[CL 8393238 by Max Chen in Dev-Editor branch]
2019-09-01 02:03:35 -04:00
Cody Albert
77166f2811 Expose GetBoundsForNode on Material Editor
#rb Lauren.Ridge

[CL 8341143 by Cody Albert in Dev-Editor branch]
2019-08-27 13:26:57 -04:00
Cody Albert
cbcf4a46cb Expose GetSelectedNodes in the material editor
#rb Lauren.Ridge

[CL 8233389 by Cody Albert in Dev-Editor branch]
2019-08-23 15:29:52 -04:00
michal valient
aa6c7de6f3 Update GUID, ties to 8182408.
#rb rolando.caloca, ben.ingram
#jira UE-79309
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 8217087 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v401-8057353)

[CL 8217089 by michal valient in Main branch]
2019-08-22 18:26:42 -04:00
lauren ridge
aa118d6bd4 Fix for material updating too frequently
#rb trivial
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 8114088 via CL 8116258 via CL 8116441
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8162040 by lauren ridge in Dev-Build branch]
2019-08-21 09:55:22 -04:00
Max Chen
719222de61 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 8153426 by Max Chen in Dev-Editor branch]
2019-08-21 00:20:50 -04:00
lauren ridge
88557de3fc Fix for material updating too frequently
#rb trivial
#rnx


#ROBOMERGE-SOURCE: CL 8114088 via CL 8116258
#ROBOMERGE-BOT: (v401-8057353)

[CL 8116441 by lauren ridge in Main branch]
2019-08-19 12:24:43 -04:00
simon tourangeau
1cbf26eab7 Fix Material Editor Bug
The references haven't been released when we quit the Material Editor.

#jira UE-78898

#rb marcus.wassmer
#lockdown nick.penwarden

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: simon.tourangeau
#ROBOMERGE-SOURCE: CL 8063131 in //UE4/Release-4.23/... via CL 8063141
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v400-8057353)

[CL 8071801 by simon tourangeau in Dev-Build branch]
2019-08-16 00:44:40 -04:00
simon tourangeau
2b8481d45d Fix Material Editor Bug
The references haven't been released when we quit the Material Editor.

#jira UE-78898

#rb marcus.wassmer
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 8063131 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v400-8057353)

[CL 8063141 by simon tourangeau in Main branch]
2019-08-15 14:06:38 -04:00
chris gagnon
ad036049ba Fix for substance tutorial not showing up.
#jira UE-78585
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 8009811 in //UE4/Release-4.23/... via CL 8009827
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v399-8035122)

[CL 8048274 by chris gagnon in Dev-Build branch]
2019-08-14 23:01:29 -04:00
Chris Gagnon
7e71fe91f1 Disabled Substance tutorial in dev / internal. Debug code was checked in.
#rb none

[CL 8010049 by Chris Gagnon in Dev-Editor branch]
2019-08-13 16:48:06 -04:00
chris gagnon
c522c4a692 Fix for substance tutorial not showing up.
#jira UE-78585
#rb Matt.Kuhlenschmidt

#ROBOMERGE-SOURCE: CL 8009811 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v396-7974030)

[CL 8009827 by chris gagnon in Main branch]
2019-08-13 16:44:28 -04:00
Chris Gagnon
b86c9f4f92 Fix for substance tutorial not showing up.
#jira UE-78585
#rb Matt.Kuhlenschmidt

[CL 8009263 by Chris Gagnon in Dev-Editor branch]
2019-08-13 16:33:51 -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
882abc56c8 Refactoring the majority of AssetEditorManager cases to AssetEditorSubsystem
#rb me

[CL 7765218 by Lauren Ridge in Dev-Editor branch]
2019-08-05 12:16:07 -04:00
michael trepka
56e542bf34 Changes to make new Clang in Xcode 11 beta compile the engine witout warnings
#rb Josh.Adams
#jira UE-77043
[FYI] Peter.Sauerbrei, Ben.Marsh, Andrew.Grant

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 7605175 in //UE4/Release-4.23/... via CL 7605181
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v385-7708028)

[CL 7714432 by michael trepka in Dev-Build branch]
2019-08-05 04:41:20 -04:00