Commit Graph

45 Commits

Author SHA1 Message Date
Matt Kuhlenschmidt
24fd139385 Fixed up locations making one off thumbnail pools and converted them to use the shared thumbnail pool.
[CL 15211295 by Matt Kuhlenschmidt in ue5-main branch]
2021-01-26 17:21:08 -04:00
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00
Zousar Shaker
77d13185b7 Copying //UE5/Dev-Cooker@14539516 to Main (//UE5/Main)
[CL 14539954 by Zousar Shaker in ue5-main branch]
2020-10-21 17:56:05 -04:00
sebastian nordgren
04bae252dd Material lists now correctly display the reset to default button on the right.
SObjectPropertyEntryBox no longer has a CustomResetToDefault argument that was being ignored. Instead, all uses of it now directly use the FDetailWidgetRow OverrideResetToDefault().

#rb lauren.barnes

[CL 14444450 by sebastian nordgren in ue5-main branch]
2020-10-08 03:21:36 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
sebastian nordgren
e690469b65 Fixed compilation issues caused by CL14375859 in plugins that I accidentally wasn't compiling.
[CL 14376324 by sebastian nordgren in ue5-main branch]
2020-09-23 09:35:43 -04:00
sebastian nordgren
5050b88330 Details view reskin phase 1.
The details view now displays gridlines between rows, and now has 4 columns - edit condition, name, value, and reset/extensions.

Edit condition widgets are now created in SDetailSingleItemRow and are placed in their own fixed column on the left of the details view. FEditConditionParser is now in FPropertyNode rather FPropertyEditor, which allows access to it more broadly - notably in SDetailSingleItemRow.

The Reset to Default SWidget can no longer be replaced - the logic for it being visible and a handler for when it is pressed is still customizable. SPropertyEditorAsset no longer has a special slot for the reset to default widget.

All extension widgets are now placed in a resizable column on the right of the panel, including the Keyframe button.

FDetailColumnSizeData is now publicly exposed by IDetailsView, and is no longer passed around as much.

#rb matt.kuhlenschmidt

[CL 14375859 by sebastian nordgren in ue5-main branch]
2020-09-23 08:16:20 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
sebastian nordgren
f52f55d544 Removed default change type value for IPropertyHandle::NotifyPostChange, and fixed all usages of it.
#fyi matt.kuhlenschmidt

[CL 13884127 by sebastian nordgren in ue5-main branch]
2020-07-17 11:52:33 -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
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
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
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
ben ingram
e00231521f #jira UE-87033
Propagate changes made to layers in base material to derived MIs
#rb none

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

[CL 11684439 by ben ingram in Main branch]
2020-02-27 14:56:33 -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
lauren barnes
3cc9e48e05 Adding refresh to parameter toggling in material layers so you can update nested children.
#jira UE-82530
#rb Jason.Stasik
[FYI] Michal.Valient

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

[CL 10075392 by lauren barnes in Main branch]
2019-11-07 16:01:41 -05:00
Rolando Caloca
7632478918 Merging //UE4/Main@9388041 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9389881 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-03 09:26:00 -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
Rolando Caloca
f83ae4807a Copying //UE4/Dev-Rendering@9317594 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9317904 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-01 13:03:04 -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
Marcus Wassmer
6b13d2d0c4 Merging //UE4/Dev-Main@8680903 to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none

[CL 8683443 by Marcus Wassmer in Dev-RenderPlat-Staging branch]
2019-09-13 18:17:11 -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
Rolando Caloca
31828e2cac Merging //UE4/Dev-Main@8580251 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 8614298 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-09-10 12:20:29 -04:00