Commit Graph

209 Commits

Author SHA1 Message Date
lauren barnes
bbcf8d7449 Adding a material parameter panel update to when a parameter is wired in
#jira UE-90880
#rb trivial
#lockdown Simon.Tourangeau

#ROBOMERGE-SOURCE: CL 12939683 in //UE4/Release-4.25/... via CL 12939688 via CL 12939695
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12939701 by lauren barnes in Main branch]
2020-04-20 17:29:15 -04:00
lauren barnes
2727f4f405 Refreshing the material parameter object now sends it to the generator as well.
#rb Arciel.Rekman
#rnx

#ROBOMERGE-SOURCE: CL 12511034 via CL 12511045 via CL 12511047
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12511055 by lauren barnes in Main branch]
2020-04-01 16:33:01 -04:00
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
98a4069429 Adding a material parameter refresh at the end of init
#jira UE-90880
#rb trivial
#rnx

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 12345769 in //UE4/Release-4.25/... via CL 12345784
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12345972 by Lauren Barnes in Main branch]
2020-03-20 15:50:08 -04:00
lauren barnes
3557cb3a38 Removing unneeded material object regeneration and added more clear calls to the material editor
#jira UE-90880
#rb trivial

#ROBOMERGE-SOURCE: CL 12296492 in //UE4/Release-4.25/... via CL 12296505
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v668-12245121)

[CL 12296948 by lauren barnes in Main branch]
2020-03-19 11:03:59 -04:00
lauren barnes
48db6e046f Removing forced refreshes of the parameters panel.
#rb Rex.Hill
#rnx
#jira UE-90502


#ROBOMERGE-OWNER: lauren.barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 12151923 via CL 12152118
#ROBOMERGE-BOT: (v659-12123632)

[CL 12152130 by lauren barnes in Main branch]
2020-03-12 14:56:53 -04:00
ben ingram
0e331a2d9c #jira UE-90490
Update cached material data before updating expression previews
#rb none

#ROBOMERGE-SOURCE: CL 12140400 in //UE4/Release-4.25/... via CL 12140507
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12140550 by ben ingram in Main branch]
2020-03-11 17:12:30 -04:00
lauren barnes
74ef918ffa Removing redundant UI refreshes
#jira crash
#rb trivial
[FYI] Ben.Ingram

#ROBOMERGE-SOURCE: CL 12116923 in //UE4/Release-4.25/... via CL 12116938
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12116947 by lauren barnes in Main branch]
2020-03-10 16:23:35 -04:00
lauren barnes
4fc5d3059f Fixing infinitely refreshing UI in material editor
#jira UE-87120
#rb Jason.Stasik
#rnx

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

[CL 12022036 by lauren barnes in Main branch]
2020-03-06 16:45:23 -05:00
Lauren Barnes
43b2b2ff76 Material layer parameter preview panel will no longer crash in the material editor.
#rb Matt.Kuhlenschmidt
#jira UE-89059

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 11938624 in //UE4/Release-4.25/... via CL 11938655
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11939210 by Lauren Barnes in Main branch]
2020-03-05 12:23:03 -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
4511728f09 Tab manager filter can now block tab spawn
#rb chris.gagnon


#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 11604269 via CL 11604360 via CL 11604439
#ROBOMERGE-BOT: (v656-11643781)

[CL 11743509 by rex hill in Main branch]
2020-02-28 11:30:46 -05:00
matt kuhlenschmidt
0f072073f6 Reworked how realtime is overriden in the editor. This fixes issues where a temporarily set realtime state is saved between editor sessions causing users to be unaware that their viewport is not realtime. Shutting down the editor during PIE or remote desktop were two such cases.
Now there is a separate api on editor viewports to set and remove a temporary override state.  Deprecated existing methods and fixed up use cases.



#ROBOMERGE-OWNER: matt.kuhlenschmidt
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 11498109 via CL 11498156 via CL 11498165
#ROBOMERGE-BOT: (v654-11333218)
#rb none

[CL 11498464 by matt kuhlenschmidt in Main branch]
2020-02-18 09:38:41 -05:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Josh Adams
aa9705149b Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing.
#rb none

[CL 11282608 by Josh Adams in Main branch]
2020-02-06 13:13:41 -05:00
brooke hubert
66806be225 Context menus now close when an undo or redo action is performed in graph editors.
#Jira UE-85032
#rb lauren.barnes

#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: brooke.hubert
#ROBOMERGE-SOURCE: CL 11189944 in //UE4/Dev-Editor/...
#ROBOMERGE-BOT: TOOLS (Dev-Editor -> Dev-Tools-Staging) (v643-11205221)

[CL 11209280 by brooke hubert in Dev-Tools-Staging branch]
2020-02-03 15:30:39 -05:00
Max Chen
b4881d8bf8 Copying //UE4/Dev-Editor to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) @11123875
#rb none
#jira none

[CL 11123880 by Max Chen in Dev-Tools-Staging branch]
2020-01-27 20:11:15 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -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
kevin ortegren
7837062732 Added new Material Editor tab window which lists all the used Custom Primitive Data parameter reads from material expression nodes in the material. They will show up red if there is a potential conflict in reading a specific slot.
#jira UE-84277
#rb none


#ROBOMERGE-SOURCE: CL 10863756 via CL 10863769 via CL 10863771
#ROBOMERGE-BOT: (v610-10636431)

[CL 10863772 by kevin ortegren in Main branch]
2019-12-20 16:08:33 -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
lauren barnes
95a2d245ff Fix for UI materials not updating, and not having shaders available in -game
#jira UE-84330
#jira UE-83268
#rb Jamie.Dale
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 10319685 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v593-10286020)

[CL 10319694 by lauren barnes in Main branch]
2019-11-20 10:34:03 -05:00
lauren barnes
b45cc7cfcf Fix for parameter overview panel not always updating when a parameter was converted back to a constant
#rb Jason.Stasik
#jira UE-83364

#ROBOMERGE-SOURCE: CL 10075863 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10075866 by lauren barnes in Main branch]
2019-11-07 16:37:28 -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
rex hill
6acee91ef5 Remove extra separator in material editor toolbar
#rb lauren.barnes
#jira UE-82355

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

[CL 9762826 by rex hill in Main branch]
2019-10-23 16:12:52 -04:00