Commit Graph

21 Commits

Author SHA1 Message Date
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
ben ingram
61b4095be4 #jira UE-89792
Add UI to disconnect/reconnect MI layers from parent material
[FYI] lauren.barnes
#rb none

#ROBOMERGE-SOURCE: CL 12166521 in //UE4/Release-4.25/... via CL 12166529
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12166536 by ben ingram in Main branch]
2020-03-13 15:39:57 -04:00
lauren barnes
2000559ec5 Fix for extra brace
#jira editor not compiling
#rb trivial
#rnx

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

[CL 12024836 by lauren barnes in Main branch]
2020-03-06 17:36:01 -05: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
Arciel Rekman
d663fe32f3 Optimize getting the material parameters for the UI.
- Cuts down the speed from ~15-20s on my machine to 4-5s for the master materials.

#rb Matt.Kuhlenschmidt, Lauren.Barnes
#jira none
[FYI] Lauren.Barnes, Ben.Ingram

(Edigrating CL 11660435 to Release-4.25).

#ROBOMERGE-OWNER: Arciel.Rekman
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 11966220 in //UE4/Release-4.25/... via CL 11966245
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11966856 by Arciel Rekman in Main branch]
2020-03-05 17:32:25 -05:00
Thomas Engel
1f3e1a7a0a Fixing a compile issue in material editor
#rb none
#jira none
#rnx
#fyi Lauren.Barnes

[CL 11964517 by Thomas Engel in Main branch]
2020-03-05 16:39:36 -05:00
Lauren Barnes
d75084cd09 Fixing incorrectly merged line
#jira none
#rb none
#fyi Arciel.Rekman

[CL 11943219 by Lauren Barnes in Main branch]
2020-03-05 13:23:18 -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
arciel rekman
b2d8c29f2c Optimize getting the material parameters for the UI.
- Cuts down the speed from ~15-20s on my machine to 4-5s for the master materials.

#rb Matt.Kuhlenschmidt, Lauren.Barnes


#ROBOMERGE-SOURCE: CL 11660435 via CL 11660477
#ROBOMERGE-BOT: (v656-11643781)

[CL 11862876 by arciel rekman in Main branch]
2020-03-03 08:56:39 -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
rex hill
8372687588 Fix duplicate localization text key
#jira UE-83383
#rnx
#rb lauren.barnes

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

[CL 10082790 by rex hill in Main branch]
2019-11-08 10:23:08 -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
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
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
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
Lauren Ridge
c0b4fd5e8c Adding scrollbar to material parameters panel
#jira none
#rb trivial

[CL 5350524 by Lauren Ridge in Dev-Editor branch]
2019-03-08 12:40:56 -05:00
Lauren Ridge
5425d1b69e Update copyright
#jira none
#rb none

[CL 4680041 by Lauren Ridge in Dev-Editor branch]
2019-01-03 17:08:49 -05:00
Ben Marsh
b57371fe68 Fix copyright notices from Dev-Editor merge causing warnings in CIS.
#rb none
#lockdown Nick.Penwarden
#fyi Chris.Gagnon

[CL 4678276 by Ben Marsh in Main branch]
2019-01-03 09:39:28 -05:00
Lauren Ridge
11206bb807 Redoing material parameters panel with property row generator
#rb Chris.Gagnon
#jira UE-54670
#jira UE-54751
#jira UE-60599

[CL 4545980 by Lauren Ridge in Dev-Editor branch]
2018-11-06 18:07:24 -05:00