Commit Graph

69 Commits

Author SHA1 Message Date
wouter burgers
e3cd7f6351 SourceControl: Fixed Content Browser not updating after reverting a Content Browser asset move to a subfolder along with any additional action that will trigger a world reload.
Technical:
- Moving an asset to a subfolder and choosing REVERT ALL works! The asset will show up again in Content Browser.
- Moving an asset to a subfolder, moving an actor (which triggers a world reload) and choosing REVERT ALL does NOT work! The asset will not show up again in Content Browser until the project is closed and re-opened. The reason it doesn't show up is because the AssetRegistry still thinks there is a REDIRECTOR asset in that location and the Content Browser doesn't show those by default.

The cause for this is that when the two packages (for example: a redirector material package and a world package) are passed into UPackageTools::ReloadPackages, it will call CreateNewMapForEditing which will cause the redirector material package to go STALE. This is tracked by FScopedTrackFilteredPackages. This results in the redirector material package never actually being reloaded, leaving the AssetRegistry with incorrect data, causing the Content Browser to not show it.

This is fixed by doing the world reload(s) separately.

#rb Manuel.Lang, Marco.Anastasi, Patrick.Enfedaque
#rnx

[CL 29916664 by wouter burgers in ue5-main branch]
2023-11-24 03:11:20 -05:00
wouter burgers
2c9f7f0ffd SourceControl: Fixed crash when reverting a newly added level file along with a world reload that that causes the editor to crash.
#rb manuel.lang, marco.anastasi, patrick.enfedaque
[REVIEW]
#rnx

[CL 29641486 by wouter burgers in ue5-main branch]
2023-11-10 10:59:45 -05:00
wouter burgers
0aab06c19d SourceControl: Fixed world not reloading when an external object is reverted.
The existing code was specific to external Actors, but there are also external Objects, such as the folders created in the SceneOutliner. Previously, creating a folder in the SceneOutliner, saving it and reverting it would not trigger a world reload, incorrectly keeping the folder visible in the SceneOutliner.

#rb manuel.lang, marco.anastasi, patrick.enfedaque
#rnx

[CL 29639562 by wouter burgers in ue5-main branch]
2023-11-10 10:15:17 -05:00
wouter burgers
c9c7215f18 SourceControl: Fixed world not reloading when a deleted external object is reverted (when it is not in memory anymore).
The existing code was specific to external Actors, but there are also external Objects, such as the folders created in the SceneOutliner. Previously, deleting a folder in the SceneOutliner, saving it, restarting the editor and reverting it would not trigger a world reload, incorrectly not showing the folder in the SceneOutliner.

#rb manuel.lang, marco.anastasi, patrick.enfedaque
#rnx

[CL 29637474 by wouter burgers in ue5-main branch]
2023-11-10 08:20:14 -05:00
philippe deseve
7b518b8604 Make sure to use loadedpath only for in memory files
Otherwise renamed packages will not resolve

#rb richard.malo

[CL 25647111 by philippe deseve in ue5-main branch]
2023-05-26 12:49:06 -04:00
marco anastasi
da6bb8b5e8 Implemented the FGetFileList operation for URC
Discussed this with [at]dave.belanger - the `FGetFileList` operation is only used by `USourceControlHelpers::GetFilesInDepotAtPath()`, and that method is currently not called by anything.

Also changed the implementation of `GetFilesInDepotAtPath()` to pass the search pattern as a parameter to the Operation.

#rb stuart.hill, dave.belanger, manuel.lang
#preflight 645a57644c3ec54e6e65f5bd

[CL 25403441 by marco anastasi in ue5-main branch]
2023-05-10 09:30:30 -04:00
marco anastasi
fedd4f7a9a Fixed: Unable to revert level file deletion in Check-in Window
#rb wouter.burgers, stuart.hill, manuel.lang
#preflight none

[CL 25333901 by marco anastasi in ue5-main branch]
2023-05-04 09:31:05 -04:00
andrew phillips
0af1080300 Alternate fix for log spam
* Added memory package filtering in SourceControlHelpers.
* Added empty string filtering when sorting unsaved assets in the outliner.

#jira UE-182072
#preflight 643d26428e01968448be7c9f

[CL 25082663 by andrew phillips in ue5-main branch]
2023-04-18 05:09:10 -04:00
marco anastasi
7827deedca Removed redundant check for status of all files after a Revert operation
#preflight none
#rb wouter.burgers

[CL 24851925 by marco anastasi in ue5-main branch]
2023-03-30 05:10:12 -04:00
wouter burgers
09ca92480b SourceControl: Fixed inconsistent results when reverting asset in 'Submit Files' dialog.
#preflight none

[CL 24541931 by wouter burgers in ue5-main branch]
2023-03-07 11:59:14 -05:00
marco anastasi
ba94a69dbb Implemented auto-save on check-in.
Fixed issue that prevented deleted objects from being restored on Revert All
As a collateral, fixed issue that caused not saving deleted files during Delete workflow to result in errors after sync
As a collateral, fixed issue that caused added and saved files to disappear after Sync Latest

#rb wouter.burgers, stuart.hill
[FYI] brooke.hubert, manuel.lang
#preflight 63ed15e5c9692d7c04ea4188

[CL 24251962 by marco anastasi in ue5-main branch]
2023-02-16 02:09:33 -05:00
wouter burgers
192829d351 SourceControl: Refactored UsesCustomProjectDir / GetSourceControlLocations usage pattern.
[CL 23965223 by wouter burgers in ue5-main branch]
2023-02-02 03:44:18 -05:00
zach rammell
1edfb3ed31 Unsaved Assets in Changelist Window
#jira UE-169781
#preflight 63d4247a5354589b5c022e4c
#rb brooke.hubert
#lockdown jeanmichel.dignard

[CL 23923988 by zach rammell in ue5-main branch]
2023-01-31 01:26:50 -05:00
stuart hill
df6df596f7 Ensure the camera does not reset when we are syncing or reverting a file or all files via source control
A scoped class is added to retain and restore all camera views which is used when we reload or sync packages.

#preflight 63d2766de55deff624ed1b5a

[CL 23867883 by stuart hill in ue5-main branch]
2023-01-26 10:15:04 -05:00
marco anastasi
b29f599449 * Refactored Sync Latest operation to improve performance
* Sync Latest no longer listing and reloading all packages when the source control provider provides a sync preview functionality. When a Sync Preview is available, Sync Latest unloads only the files that are going to be overwritten by the sync operation, and then reloads them and the world

* Refactored Revert All operation to improve performance
* Revert All no longer lists and reloads all packages when the source control provider provides a sync preview functionality. Instead it unloads only the files that may be overwritten by the revert operation (i.e. submittable files), and then reloads them and the world
* Replaced RevertAndReloadAllPackages with RevertAndReloadWorld, no longer listing and reloading all packages (see https://p4-swarm.epicgames.net/reviews/23244245/)

This review is a combination of the two archived reviews https://p4-swarm.epicgames.net/reviews/23736137 and https://p4-swarm.epicgames.net/reviews/23736282

#rb wouter.burgers, stuart.hill, brooke.hubert, francis.hurteau
#preflight 63c9c7786a00f3cc8ead6779

[CL 23796067 by marco anastasi in ue5-main branch]
2023-01-20 15:31:16 -05:00
marco anastasi
d28eb652fb Implemented Asset Revert functionality from Scene Outliner.
Fixed 'Cannot revert umaps with Skein' by reloading all assets when attempting to revert a map
Implemented 'Revert All' button

#rb patrick.enfedaque, wouter.burgers, stuart.hill, manuel.lang
[FYI] francis.hurteau, brooke.hubert
#preflight 6388f51d4c3ce8ae5dbfb18f

#preflight 639340545c5308d18c28b967

[CL 23475314 by marco anastasi in ue5-main branch]
2022-12-11 23:09:22 -05:00
richard malo
27956d595f Avoid getting spam warnings coming from world outliner usaved column trying to resolve actor memory package path when running PIE.
#rb jeanfrancois.dube
#preflight 6386298df213a116eb293e15

[CL 23312521 by richard malo in ue5-main branch]
2022-11-29 12:35:57 -05:00
aditya ravichandran
f8b7ee5555 Replace any instances of "Source Control" with "Revision Control" in text in the Editor
#rb JeanMichel.Dignard, Robb.Surridge
#preflight 637d180efa348e8480e8837e

[CL 23250808 by aditya ravichandran in ue5-main branch]
2022-11-23 11:57:50 -05:00
henrik karlsson
fa90b399a4 Added includes for future change. This changelist only contains added #include and a couple of empty placeholder files
Tested compiling fortnite, unrealeditor, lyra, qagame with non-unity/pch

#preflight 63635997876630122adeab9f
#rb none

[CL 22958990 by henrik karlsson in ue5-main branch]
2022-11-03 14:18:47 -04:00
patrick enfedaque
5b51457a6c - Remove UUnrealEdEngine::OnSourceControlFilesDeleted delegate (Unloading/Reloading of packages should be handled by USourceControlHelpers::ApplyOperationAndReloadPackages)
- Change ApplyOperationAndReloadPackages so that it calls DeleteObjectsUnchecked instead of UnloadPackage (which is what OnSourceControlFilesDeleted did)

#rb luc.eygasier
#preflight 634040d8437603cb0e2b7d03
#rnx

[CL 22456126 by patrick enfedaque in ue5-main branch]
2022-10-11 08:37:16 -04:00
bryan sefcik
0beee50b45 Updated ../Engine/Source/Developer/... to inline gen.cpp files
Before:
Total CPU Time: 53783.640625 s
Total time in Parallel executor: 558.66 seconds
After:
Total CPU Time: 47886.140625 s
Total time in Parallel executor: 498.81 seconds

#jira

[CL 22173145 by bryan sefcik in ue5-main branch]
2022-09-24 13:31:25 -04:00
patrick laflamme
baaeea90d5 Fixed a crash that happening when a an asset that was just added to source control was reverted and the package was unloaded.
#rb Luc.Eygasier
#preflight 6328cdd90a4ad044de4367f0

[CL 22088593 by patrick laflamme in ue5-main branch]
2022-09-20 00:46:40 -04:00
luc eygasier
48a54c4e48 Fixes packages from different project paths unable to be reverted.
#rb Patrick.Enfedaque
#preflight 62fe8dcaaa546d5e9d05d0a4
#changelist validated

[CL 21499945 by luc eygasier in ue5-main branch]
2022-08-22 21:22:48 -04:00
luc eygasier
0cda7fc8ed Modifies revert operations in source control window to also reload packages.
Adds Source Control Helper method to perform a modular source control operation and reload the concerned packages

#rb Patrick.Enfedaque
#preflight 62fd4e63e64b1a510937890b
#changelist validated

[CL 21444877 by luc eygasier in ue5-main branch]
2022-08-18 13:03:11 -04:00
patrick enfedaque
578bc094cd SCC: Dependency validation only on hard refs
#rb jeanfrancois.dube
#preflight 62fa5395153b17e746322f0c

#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 21387351 via CL 21390995 via CL 21391795
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v975-21357124)

[CL 21394315 by patrick enfedaque in ue5-main branch]
2022-08-15 17:13:39 -04:00