Commit Graph

79 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
aurel cordonnier
34f55d3a4a Merge from Release-Engine-Test @ 17946149 to UE5/Main
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17949667 by aurel cordonnier in ue5-main branch]
2021-10-27 15:14:40 -04:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
aurel cordonnier
69fe095547 Merge from Release-Engine-Staging @ 17636544 to Release-Engine-Test
This represents UE4/Main @17638339 and Dev-PerfTest @17636504

[CL 17638842 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-27 19:54:25 -04:00
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -04:00
julien stjean
61d7055b8b Improve the performence when expending all the folders of the SPathView widget.
From 4s to less than a 1 ms in the project TestEngine while expending all the folders.
The processing has been moved to the function populate where it take between 3 to 6 ms to run when needed.

#Jira UE-120967
#rb Jamie.Dale
#preflight 611d5567e7a30700013bc470

#ROBOMERGE-SOURCE: CL 17225662 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17225669 by julien stjean in ue5-release-engine-test branch]
2021-08-18 19:56:29 -04:00
aurel cordonnier
dc4bf61540 Merge from Release-Engine-Staging @ 17030559 to Release-Engine-Test
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17030553

[CL 17031509 by aurel cordonnier in ue5-release-engine-test branch]
2021-08-03 11:56:47 -04:00
jamie dale
c2baa14e1b Sort asset names in a way that handles all trailing numbers, including fully numeric names
#jira UE-26544
#rb Jason.Stasik, Rex.Hill
#preflight 6101c74bff10730001d1d000

#ROBOMERGE-SOURCE: CL 16989447 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v838-16927207)

[CL 16989457 by jamie dale in ue5-release-engine-test branch]
2021-07-28 18:51:29 -04:00
Jamie Dale
3649fdd9e3 Suppress Tick from modal dialogs during rename finalization in the Content Browser
This can cause a reentrancy issue where the item currently being renamed is removed via an update while we're still processing it

#rb Francis.Hurteau

[CL 16412079 by Jamie Dale in ue5-main branch]
2021-05-20 18:56:49 -04:00
jonathan bard
3c9acb55e4 Fixed case sensitive sorting of folders in path view (not consistent with the folder view)
#rb rex.hill
#jira none
#rnx

[CL 16300184 by jonathan bard in ue5-main branch]
2021-05-12 11:35:31 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -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
Mike Zyracki
aae5f97323 Content Browser: Control Rig: Expose CustomBlackListFolder to PathPickerConfig so we can only see one root and not every folder for the Pose Library.
#jira UE-102478
#rb rex.hill

[CL 14668229 by Mike Zyracki in ue5-main branch]
2020-11-05 15:23:04 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
JeanFrancois Dube
cab5d7ce2f Content Browser: don't try to remove items folders when adding new items that don't pass the required filters.
Saves over a minute when loading Apollo_Terain converted to World Partition.

#rb jamie.dale

[CL 14528556 by JeanFrancois Dube in ue5-main branch]
2020-10-20 16:11:36 -04:00
Jamie Dale
b8f60355dc Fixed SPathView sometimes switching to "All Assets" during asset discovery
#rb none
#rnx

[CL 14184079 by Jamie Dale in ue5-main branch]
2020-08-25 17:49:45 -04:00
Jamie Dale
a936973228 Fixed the initial Content Browser selection sometimes being "All Assets"
This could happen as SetSelectedPaths wouldn't update LastSelectedPaths, which would result in the next call to Populate clearing the selection unless LoadSettings had provided a selection (which it doesn't by default for an empty config).

This change has SetSelectedPaths also update LastSelectedPaths, and LoadSettings will now clear that again when applying its settings, including if there are no paths saved (meaning "All Assets" was actually requested).

#jira UE-95852
#rb Rex.Hill
#rnx

[CL 14079494 by Jamie Dale in ue5-main branch]
2020-08-11 14:39:38 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Matt Kuhlenschmidt
291384041d Editgrate CL 13760226
Fixed broken text filter in Content Browser path view

#jira UE-94832
#rnx

[CL 13955838 by Matt Kuhlenschmidt in ue5-main branch]
2020-07-28 11:37:55 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
devin doucette
f98e729831 Avoided an editor crash when the user developer directory cannot be found
#jira UE-90266
#rb Zousar.Shaker
#rnx

#ROBOMERGE-SOURCE: CL 12308523 in //UE4/Release-4.25/... via CL 12308533
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v670-12295787)

[CL 12308557 by devin doucette in Main branch]
2020-03-19 15:30:43 -04:00
rex hill
3a42191ac5 Path view widget can now optionally filter out read-only folder paths
#rb none


#ROBOMERGE-SOURCE: CL 11769465 via CL 11772196 via CL 11772390
#ROBOMERGE-BOT: (v656-11643781)

[CL 11869116 by rex hill in Main branch]
2020-03-03 11:33:58 -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
01959e1487 Refactor folder blacklists
#ROBOMERGE-SOURCE: CL 10709001 via CL 10713780
#ROBOMERGE-BOT: (v610-10636431)

[CL 10713969 by rex hill in Main branch]
2019-12-13 14:29:24 -05:00