Commit Graph

31 Commits

Author SHA1 Message Date
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
sebastian nordgren
1791adb9a8 Deprecated bDisplayResetToDefault and the other checkboxes in IPropertyHandle::CreatePropertyNameWidget().
#jira UE-132670
#preflight 61a601ff9a226d9e8235b12e

[CL 18323004 by sebastian nordgren in ue5-main branch]
2021-11-30 06:04:48 -05:00
sebastian nordgren
1131b138d5 Moved FDetailColumnSizeData to its own file.
#rb paul.chipchase
#preflight 617c0f47c44dc500016a989d

[CL 18017897 by sebastian nordgren in ue5-main branch]
2021-11-02 09:22:12 -04:00
aurel cordonnier
8eebe8841f Merge UE5/RET @ 16305968 to UE5/Main
This represents UE4/Main @ 16261013 and Dev-PerfTest @ 16259937

[CL 16306996 by aurel cordonnier in ue5-main branch]
2021-05-12 18:10:03 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
lauren barnes
73f5d201b3 Material Editor Cleanup Pass
#rb Matt.Kuhlenschmidt
#jira UE-104842

#ROBOMERGE-SOURCE: CL 15421050 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15421081 by lauren barnes in ue5-main branch]
2021-02-16 15:32:34 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
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
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
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