Commit Graph

435 Commits

Author SHA1 Message Date
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
ben ingram
8a7b112555 #jira none
Make some BP utility functions static so they can actually be called
#rb none

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

[CL 12252802 by ben ingram in Main branch]
2020-03-18 17:03:33 -04:00
ben ingram
2260c7703c #jira UE-90705
Fix duplicate LOCTEXT
#rb none

#ROBOMERGE-SOURCE: CL 12221721 in //UE4/Release-4.25/... via CL 12221754
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v662-12191386)

[CL 12221821 by ben ingram in Main branch]
2020-03-16 16:06:37 -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
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
peter knepley
6ce3499652 Back out changelist 12117723
[FYI] Nick.Darnell
#jira


#ROBOMERGE-SOURCE: CL 12136905 via CL 12136907
#ROBOMERGE-BOT: (v659-12123632)

[CL 12136909 by peter knepley in Main branch]
2020-03-11 14:18:11 -04:00
nick darnell
f26bb64eea Moving the texture parameter's value property to the top of the details panel
#jira UE-90350
[FYI] Lauren.Barnes


#ROBOMERGE-SOURCE: CL 12117712 via CL 12117723 via CL 12128129
#ROBOMERGE-BOT: (v659-12123632)

[CL 12128284 by nick darnell in Main branch]
2020-03-11 11:23:40 -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
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
lauren barnes
ef4d95529a Don't allow channel names for the channel mask parameter
#jira UE-90086
#rb Jamie.Dale

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

[CL 11912891 by lauren barnes in Main branch]
2020-03-04 15:20:58 -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
carl lloyd
fe57817d94 Added Android Desktop Forward Rendering (Experimental)
[at]jack.porter [at]dmitry.dyomin [at]juan.canada [at]rolando.caloco
#rb jack.porter, dmitry.dyomin, juan.canada, rolando.caloco
#jira none

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

[CL 11824898 by carl lloyd in Main branch]
2020-03-02 11:00:17 -05:00
ben ingram
8fd50034e8 #jira UE-82636
When deciding what to recompile after chaning a MF, look at all MIs, instead of stopping after finding the first match
#rb none

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

[CL 11792961 by ben ingram in Main branch]
2020-02-28 20:20:41 -05: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