Commit Graph

187 Commits

Author SHA1 Message Date
julien stjean
302f52ee97 Changed a check to a ensure to avoid crashing in a bad scenario where an asset creation would be requested while a another is active still active.
Added a line of log to help us track the potential cause of the issue.

#jira UE-104471
#preflight 61a8db639c77d610079f42ab

#ROBOMERGE-AUTHOR: julien.stjean
#ROBOMERGE-SOURCE: CL 18352172 in //UE5/Release-5.0/... via CL 18352195
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18352205 by julien stjean in ue5-release-engine-test branch]
2021-12-02 10:20:12 -05:00
aditya ravichandran
e9688809f4 Asset Picker: Fix an issue preventing some options in the Asset Picker from working when summoned from a menu
#jira UE-108063
#rb lauren.barnes
#preflight 619e6b88801b361978c8f58a

#ROBOMERGE-AUTHOR: aditya.ravichandran
#ROBOMERGE-SOURCE: CL 18285239 in //UE5/Release-5.0/... via CL 18285248
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18285253 by aditya ravichandran in ue5-release-engine-test branch]
2021-11-24 12:19:18 -05:00
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -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
daren cheng
45625f4109 Performance improvements to widget library.
Add callback for source data generation to asset views.
Add UObject enumeration to content browser API (By Rex Hill).
Intentionally reserve thumbnail pool sizes instead of flat 1024 reservation.

#jira UE-129795
#rb Rex.Hill
#preflight 615e0c51c5e9590001f4a22a
#preflight 615e4400f13022000126efda

#ROBOMERGE-AUTHOR: daren.cheng
#ROBOMERGE-SOURCE: CL 17744889 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v879-17706426)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0
#ROBOMERGE[bot1]: Main

[CL 17744914 by daren cheng in ue5-release-engine-test branch]
2021-10-06 21:35:45 -04:00
aditya ravichandran
77f084d116 Scroll Bars now highlight when hovering anywhere along the slider well
Moved Show Empty Folders to the top level in Content Browser Settings
Replaced the icon for SingleFrameAdvance in the play control toolbar buttons
#jira UETOOL-3815
#rb steven.dao
#preflight 613a53e90c19af0001c4f0ad

#ROBOMERGE-AUTHOR: aditya.ravichandran
#ROBOMERGE-SOURCE: CL 17475265 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17475269 by aditya ravichandran in ue5-release-engine-test branch]
2021-09-09 15:19:23 -04:00
matt kuhlenschmidt
5d10725c0c Fix up use cases of specifying "PrimaryButton" style directly. Replaced instances with SPrimaryButton
#pf https://horde.devtools.epicgames.com/job/612d40b9423a8f00013c5b92

#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 17457077 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17457092 by matt kuhlenschmidt in ue5-release-engine-test branch]
2021-09-08 08:29:49 -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
daren cheng
1feccb8ad3 Enable widget library by default.
---
Add size & type display options to SAssetView constructor / interface.
Implement search & centralized list / column / size control on widget library.

#jira UE-121731
#rb Julien.StJean, Vincent.Gauthier
#preflight 611d61c88ff554000152647e

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

[CL 17234363 by daren cheng in ue5-release-engine-test branch]
2021-08-19 11:04:54 -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
steven dao
fab60388a6 Re-add adjusting Content Browser thumbnail size via ctrl+mouse scroll wheel
This previously worked in UE4, then was removed when the thumbnail size selector was changed from a continuous slider to discrete predefined options.

#jira UETOOL-3281
#rb lauren.barnes
#preflight 6101beabb4288d0001b7a6e0

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

[CL 16988669 by steven dao in ue5-release-engine-test branch]
2021-07-28 18:02:38 -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
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
matt kuhlenschmidt
fa3ea308fa Fix generic thumbnail images for content browser assets not scaling based on user thumbnail size
#jira UE-112761

#ROBOMERGE-SOURCE: CL 15918539 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15920961 by matt kuhlenschmidt in ue5-main branch]
2021-04-05 14:56:18 -04:00
daren cheng
840ff3db22 Edigrate 15459510.
Don't allow assets to be created in content browser while a rename is occuring.

#jira UE-106064
#rb Jamie.Dale

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

[CL 15517488 by daren cheng in ue5-main branch]
2021-02-24 14:23:39 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
matt kuhlenschmidt
9e482fe7c6 Cleanup progress bar styles and fix slow task not showing the secondary progress bars
#ROBOMERGE-SOURCE: CL 15379156 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15383280 by matt kuhlenschmidt in ue5-main branch]
2021-02-10 19:52:17 -04:00
matt kuhlenschmidt
ed5702eb16 Fix content browser settings icon being too hard to see with no text label
Fix content browser tile medium size thumbnails not allowing 3 lines for the asset name

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

[CL 15371127 by matt kuhlenschmidt in ue5-main branch]
2021-02-09 17:56:15 -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
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Louise Rasmussen
e96422024e Updated Style Colors - replaced "Background" Color with "Panel" Color and updated "Background" Color to be dark base
#rb matt.kuhlenschmidt

[CL 15013052 by Louise Rasmussen in ue5-main branch]
2021-01-07 14:20:25 -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
geoff evans
bde28af943 Redefine Content Browser's "RealTime Thumbnails" to be only the item the cursor is hovering over instead of every thumbnail in an SAssetView.
This change removes the use of boolean attribute AreRealTimeThumbnailsAllowed. This attribute is less than ideal, design-wise, since it uses the thumbnail pool to drive the behavior of the thumbnails. Instead we build in default hover behavior to the thumbnail slate widgets, and implement plumbing for custom pathways to enable/disable real time behavior per thumbnail.

-> Add default OnMouseEnter/OnMouseLeave events on SAssetThumbnail for default hover behavior (over the actual thumbnail image), which supports detail panel, customizations, and things like FoliageEditor and Niagara Stack Overview thumbnail strip.
-> Add thumbnail initialize pathway support for disabling default hover behavior for use cases where the logical asset is more than just the thumbnail image (border elements, text elements with the asset name, etc).
-> Add custom OnMouseEnter/OnMouseLeave handlers on SAssetTileItem, SAssetListItem to perform real time behavior on entire logical asset item in Content Browser and Asset Picker.

#rb francis.hurteau
#fyi matt.kuhlenschmidt
#jira UETOOL-2363

[CL 14673948 by geoff evans in ue5-main branch]
2020-11-05 21:41:33 -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
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