Commit Graph

379 Commits

Author SHA1 Message Date
JeanMichel Dignard
d4f0f4d3f2 Copying //UE4/Dev-Enterprise @ cl 9420543 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 9420574 by JeanMichel Dignard in Main branch]
2019-10-04 13:11:45 -04: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
Marc Audy
5fb00d38a0 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 8902520
#rb
#rnx

[CL 8914290 by Marc Audy in Dev-Framework branch]
2019-09-19 17:46:29 -04:00
jeremy moore
fa4514c8f8 Decouple the concepts of VT texture layer and VT page table layer.
This allows us to put texture layers into physical groups that will be accessed through the same page table layer (and so must share the same UV in different physical textures).
Physical spaces can now contain multiple texture layers (one for each member of a physical group).
Changed the logic for the physical space pool descriptions so that we can support multiple texture layers. And also made the description work for Min and Max tile size values so that we don't need to specify pool sizes multiple times for each possible tile size.
Runtime virtual texture can select if it wants to use a single physical group. By default this is on so that RVT uses a single page table channel.
#rb none
[FYI] Ben.Ingram


#ROBOMERGE-OWNER: jeremy.moore
#ROBOMERGE-AUTHOR: jeremy.moore
#ROBOMERGE-SOURCE: CL 8747955 via CL 8748343 via CL 8782324
#ROBOMERGE-BOT: (v422-8689730)

[CL 8790675 by jeremy moore in Main branch]
2019-09-17 20:33:19 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
Michael Noland
9b9534df0b Added an option to the Material Editor user preferences to set the default size for the material editor preview viewport when viewing a material/material instance with "User Interface" domain
#codereview lauren.ridge, jon.hunt, david.hunt
#jira nojira
#rb none

[CL 8681589 by Michael Noland in Dev-Framework branch]
2019-09-13 17:12:43 -04:00
lauren barnes
bfcfa40d0a Removing stale handle being used when changing a property in a layer.
#jira UE-73129
#rb trivial
#rnx


#ROBOMERGE-SOURCE: CL 8641859 via CL 8652774
#ROBOMERGE-BOT: (v417-8656536)

[CL 8657848 by lauren barnes in Main branch]
2019-09-12 13:56:13 -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
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
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
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
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
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
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
michael trepka
f7af6da126 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-SOURCE: CL 7605175 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7605181 by michael trepka in Main branch]
2019-07-24 09:57:26 -04:00
lauren ridge
038a442037 Fix for material instance with no parent being opened for edit
#jira UE-77671
#rb copiedCL
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 7476839 via CL 7492270 via CL 7544868 via CL 7544873
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v372-7473910)

[CL 7590037 by lauren ridge in Dev-Build branch]
2019-07-24 01:30:45 -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
lauren ridge
4876979691 Adding default text in case a parent material isn't found
#jira UE-77421
#rb trivial

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 7427308 in //UE4/Release-4.23/... via CL 7427321
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v372-7473910)

[CL 7488782 by lauren ridge in Dev-Build branch]
2019-07-22 20:46:47 -04:00