Commit Graph

176 Commits

Author SHA1 Message Date
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
Matt Kuhlenschmidt
a8970c67a8 More fixes to splitters and separators after the style flattening
[CL 14248196 by Matt Kuhlenschmidt in ue5-main branch]
2020-09-02 17:06:51 -04:00
Matt Kuhlenschmidt
0a187c6d0e Update content browser search and filter styling
[CL 14092115 by Matt Kuhlenschmidt in ue5-main branch]
2020-08-12 11:50:06 -04:00
Jamie Dale
d4e2440703 Re-added in-place frontend filter of recently modified Content Browser items
This can avoid a costly content re-sort if the item still passes the frontend filters

#jira UE-95747, FORT-302541, FORT-302137
#rb Rex.Hill
#rnx

[CL 14079739 by Jamie Dale in ue5-main branch]
2020-08-11 15:02:24 -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
2e1aa75fa4 Content browser reskin reworks
Changed the look of folders
Changed the look of filters
Changed the look of the text for asset tiles

[CL 13963307 by Matt Kuhlenschmidt in ue5-main branch]
2020-07-29 10:50:26 -04:00
Matt Kuhlenschmidt
5c064acc86 Initial pass on content browser reskin
[CL 13949190 by Matt Kuhlenschmidt in ue5-main branch]
2020-07-27 16:11:54 -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
robert manuszewski
b7568cc694 Fix for UE-90683: You can no longer delete conflicting variables
Refactored FindField into FindUField and FindFProperty to avoid confusion caused by the fact that FindField<UField> will no longer return FProperties.

#jira UE-90683
#rb Steve.Robb
#tests Basic editor functionality test, cooked and ran PC client and server, bot soak tests for two hours

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 12190998 in //UE4/Release-4.25/... via CL 12190999
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12191300 by robert manuszewski in Main branch]
2020-03-15 10:33:45 -04:00
rex hill
4511728f09 Tab manager filter can now block tab spawn
#rb chris.gagnon


#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 11604269 via CL 11604360 via CL 11604439
#ROBOMERGE-BOT: (v656-11643781)

[CL 11743509 by rex hill in Main branch]
2020-02-28 11:30:46 -05:00
rex hill
6a25b843d5 Fix content browser class blacklist not being applied
#ROBOMERGE-SOURCE: CL 11567023 via CL 11567108 via CL 11567120 via CL 11567133
#ROBOMERGE-BOT: (v654-11333218)

[CL 11567144 by rex hill in Main branch]
2020-02-20 12:55:25 -05:00
sebastien lussier
f0904e7732 Fix asset view with an active filter killing the editor performance when assets are added.
In a project with a lot of assets (let's say ~400K assets), SAssetView::ProcessRecentlyAddedAssets() would process a single asset during it's alloted time slice. The recreation of the set on each call would make the editor run at >10fps until the whole array is processed, at one asset per tick.

It's easy to reproduce by starting the editor and clicking on the "Content" root in the Content Browser, then typing anything in the Filter box while the asset discovery is in progress. The asset discovery will complete but the editor performance will be degraded until the filter is cleared.

With these changes, all new assets are processed in the allowed time with a single call to ProcessRecentlyAddedAssets()
#rb jamie.dale


#ROBOMERGE-SOURCE: CL 11292517 via CL 11292526 via CL 11292528 via CL 11292529
#ROBOMERGE-BOT: (v647-11244347)

[CL 11293016 by sebastien lussier in Main branch]
2020-02-07 13:08:21 -05:00