Commit Graph

72 Commits

Author SHA1 Message Date
bob tellez
136ec97806 #UE4 Material and MaterialInstance editors now reports the temporary top level preview objects they spawn to the asset toolkit so external code can see them (useful in property editor code, since users are editing the preview objects, not the real ones). Also made the objects in RegenerateArrays children of the object they are spawned for, also for discovery reasons.
#jira UE-91182

#ROBOMERGE-SOURCE: CL 12465625 via CL 12465718 via CL 12467508 via CL 12467676
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v672-12450963)

[CL 12467769 by bob tellez in Main branch]
2020-03-27 10:59:17 -04:00
lauren barnes
521a608178 Getting material layer parameter visibility to be impacted by static switches
#jira UE-89644
#rb Ben.Ingram

#ROBOMERGE-SOURCE: CL 11772820 in //UE4/Release-4.25/... via CL 11772860
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11776773 by lauren barnes in Main branch]
2020-02-28 16:04:42 -05:00
rex hill
9895a6b588 Material Editor: Toolbar converted into tool menus. Hierarchy menu converted to use same custom widget as material instance editor.
#rb none
#jira UE-89380


#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 11612429 via CL 11612432 via CL 11612438
#ROBOMERGE-BOT: (v656-11643781)

[CL 11762021 by rex hill in Main branch]
2020-02-28 13:52:14 -05:00
rex hill
e7afe98d85 Fix duplicate items on Material Instance Toolbar
#jira UE-89380
#rb none


#ROBOMERGE-SOURCE: CL 11608922 via CL 11608931 via CL 11608941
#ROBOMERGE-BOT: (v656-11643781)

[CL 11758588 by rex hill in Main branch]
2020-02-28 13:34:25 -05: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
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
rex hill
59d14b16b7 Parameter to constrain menu height, merged from CL 9763699
#jira UE-79942
#rb rex.hill
[FYI] lauren.barnes


#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 10083765 via CL 10083767
#ROBOMERGE-BOT: (v574-10069753)

[CL 10086476 by rex hill in Main branch]
2019-11-08 15:01:46 -05:00
rex hill
62bc081d51 Brought over changes related to Tool Menus
#rnx
#rb none


#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 9968254 via CL 9968365
#ROBOMERGE-BOT: (v560-9963197)

[CL 9969240 by rex hill in Main branch]
2019-11-04 12:21:36 -05:00
lauren barnes
636c906dbd Added parameter to constrain menu height
#rb Rex.Hill
#jira UE-79942
[FYI] Marc.Audy

#ROBOMERGE-SOURCE: CL 9763690 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v545-9751379)

[CL 9763699 by lauren barnes in Main branch]
2019-10-23 16:47:44 -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
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
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
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
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
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
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
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
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
Chris Gagnon
a48e767b94 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4835066 by Chris Gagnon in Dev-Editor branch]
2019-01-29 16:15:19 -05:00
Rolando Caloca
732810a13b DR - Copying //UE4/Dev-Main@4785067 to //UE4-DevRendering
#rb none
#rnx
#lockdown Marcus.Wassmer

[CL 4790611 by Rolando Caloca in Dev-Rendering branch]
2019-01-23 17:01: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
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