22 Commits

Author SHA1 Message Date
jordan hoffmann
e1ebf0c88b Re-attempting merge in 26660318 that was backed out in 26661239 due to compilation errors
--------------------------------------------------------------------------------------------------------
[Feature] made local assets editable in DataAsset diffs
[BugFix] invisible merge buttons were clickable in detail splitter when they shouldn't be
[BugFix] blueprint diffs weren't updating their detail panels when the objects are edited

[CL 26680442 by jordan hoffmann in 5.3 branch]
2023-07-28 14:10:55 -04:00
jordan hoffmann
78aadb19c7 [Backout] - CL26660318
[FYI] jordan.hoffmann
Original CL Desc
-----------------------------------------------------------------
[Feature] made local assets editable in DataAsset diffs
[BugFix] invisible merge buttons were clickable in detail splitter when they shouldn't be
[BugFix] blueprint diffs weren't updating their detail panels when the objects are edited

[CL 26661256 by jordan hoffmann in 5.3 branch]
2023-07-27 19:32:52 -04:00
jordan hoffmann
da41e1e091 [Feature] made local assets editable in DataAsset diffs
[BugFix] invisible merge buttons were clickable in detail splitter when they shouldn't be
[BugFix] blueprint diffs weren't updating their detail panels when the objects are edited

[CL 26660367 by jordan hoffmann in 5.3 branch]
2023-07-27 18:49:18 -04:00
jordan hoffmann
0fc6b63d92 [BugFix] Merge stopped working because ISourceControlProvider.GetState doesn't use depot file paths and FResolveInfo::IsValid had a bug
#rb none
#preflight 6467d56b75696d2bd70382c9

[CL 25551458 by jordan hoffmann in ue5-main branch]
2023-05-19 16:20:13 -04:00
kirill zorin
de8db5ff76 Converting ARO-facing raw pointers to TObjectPtr ahead of raw pointer ARO API deprecation.
#rb zousar.shaker
#rb markus.breyer
#rb robert.manuszewski

#preflight 646391406b1406b54ab15460

[CL 25489627 by kirill zorin in ue5-main branch]
2023-05-16 10:52:49 -04:00
jordan hoffmann
1625c5cc66 [BugFix] Deprecated ISourceControlState::GetBaseRevForMerge and replaced it with ISourceControlState::GetResolveInfo so we can properly support merges and integrations between branches and merging changes that aren't the latest
#rb brooke.hubert, mattias.jansson, wouter.burgers
#preflight 64556c1ad77a82d6a78e3388

[CL 25365368 by jordan hoffmann in ue5-main branch]
2023-05-06 02:07:43 -04:00
MothDoctor
77b8bfd3e7 Adapted from PR #9900: Fix FAssetTypeActions_DataTable warnings caused by UE 5.1 FTopLevelAssetPath refactor
#jira UE-172519
#rb ben.zeigler
#preflight 644ac35d693defa68d8f9101

[CL 25226128 by MothDoctor in ue5-main branch]
2023-04-27 19:26:08 -04:00
jordan hoffmann
53bf730f48 [CIS Fix] Static analysis missing null check fix
#rb none
#preflight trivial

[CL 25150925 by jordan hoffmann in ue5-main branch]
2023-04-21 14:56:11 -04:00
jordan hoffmann
fb8b799b90 [CIS Fix] AssetDefinition_DataAsset Non-Unity errors
#rb none
#preflight trivial

[CL 25058081 by jordan hoffmann in ue5-main branch]
2023-04-14 21:49:55 -04:00
jordan hoffmann
ed0180eb48 [CIS Fix] AssetDefinition_DataAsset.cpp(202): error C2065: 'GEditor': undeclared identifier
#rb none
#preflight trivial

[CL 25057803 by jordan hoffmann in ue5-main branch]
2023-04-14 21:26:41 -04:00
jordan hoffmann
cf8eb1d3c9 [Feature] AssetDefinition Merging
#jira UE-181566
#jira UE-181560
#rb ben.hoffman, dave.jones
#preflight 6439c1fec947f6523a79534d

[CL 25057796 by jordan hoffmann in ue5-main branch]
2023-04-14 21:26:21 -04:00
jordan hoffmann
31b04b24ba [Feature/Bugfix] Support for diffing against nullptr (treated as an empty or nonexistent file)
#rb dan.oconnor
#preflight 63d83f963656ea96dc2a0a4c

#jira UE-173747
"Crash occurs when scrolling down through files in Review Changelist window upon loading of asset"
  - certain widget blueprints were crashing the review tool because we were working around the inability to diff against nullptr by constructing temprorary empty objects. This approach circumvents that problem entirely

#jira UE-173231
"Changelist Review tool allows diffing against previous revision for Deletion changes"
  - while this jira suggests that the ability to diff deletion changes is a bug, it was actually an intended feature. The real bug was that it would crash or fail to work in many cases. This has been fixed by either asset diffing against nullptr or text diffing against an empty file (depending on circumstance)

#jira UE-174610
"Reviewing Changelist with Deletion Changes results in LogLinker warnings & LoadErrors"
 - deletion changes were trying to load the new revision of files but obviously it doesn't exist because it's a deletion. Fixed by only loading the previous revision


note: since the review tool is going to be "Production Ready"  in 5.2, these changes are neccesary for stability

[CL 23924072 by jordan hoffmann in ue5-main branch]
2023-01-31 01:28:46 -05:00
dave belanger
b19f158551 Hide "Convert to Different DataAsset Type" menu if none of the selected asset can be edited
#rb Rex.Hill
#preflight 63d2ece5be1970f882b926ce

[CL 23889504 by dave belanger in ue5-main branch]
2023-01-27 14:51:32 -05:00
henrik karlsson
68e1306935 [Engine/Plugins]
* Removed more includes using iwyu and marked up includes that is removed because of bugs in iwyu.

#preflight 63bfc8696c4f5668eb3a3cbd
#rb none

[CL 23666746 by henrik karlsson in ue5-main branch]
2023-01-12 13:53:03 -05:00
henrik karlsson
2f78497e67 [Engine/Plugins]
* Updated private files with IWYU for all plugins which had 3 or less changes made in ue5 main since last integration to fn

#preflight 63bf8d8b577437afe607dc72
#rb none

[CL 23659643 by henrik karlsson in ue5-main branch]
2023-01-12 01:48:34 -05:00
nick darnell
b81efdcf63 AssetDefinition - Upgrading several sound asset actions.
AssetDefinition - Fixing a regression where we needed to load assets on right click to check a 'can we create a blueprint from this asset' option.
AssetDefinition - Making the dynamic entries for GetAssetActions nameless so that they don't stomp eachother on accident.
AssetDefinition -

#jira UE-165574

[CL 23632575 by nick darnell in ue5-main branch]
2023-01-10 15:49:07 -05:00
henrik karlsson
6c0988b13c [Engine/Plugins/Editor]
* Ran IWYU on all private code in the plugins under this folder.

#preflight 63bbb322c45a2c81e0673a9c
#rb chris.waters

[CL 23631839 by henrik karlsson in ue5-main branch]
2023-01-10 15:24:20 -05:00
aditya ravichandran
9283af8219 Temp workaround to bring back the Data Asset filter in the Content Browser
#rb lauren.barnes
[FYI] nick.darnell
#preflight 6384f8bab21cdd3a2602fdf4
#jira UE-171153

[CL 23300300 by aditya ravichandran in ue5-main branch]
2022-11-28 19:16:43 -05:00
nick darnell
e85b0cd48c AssetDefinition - This is the seed of a long term replacement of IAssetTypeActions. IAssetTypeActions is woefully inadiquit now. It puts a lot of functionality in one place, which wouldn't be a terrible thing, except for the GetActions, and some of the menu stuff being built into this class. We need to make an effort to not have to load every single asset just to open the context menu you have selected, to-wit, a previous CL made it so that summoning the menu no longer *Had* to load the assets, however several remaining issues remained with the Blueprint Utility Actions, and the fact that we don't "KNOW" if we need to call GetActions for an asset. We could introduce a replacement in the class, but that would just get inherited, causing other issues. So instead the parallel UObject based AssetDefinition now exists. In large part it will probably be very similar to the other one, but several things in it probably need to chnage. For now there is a bridging concept in the form of the AssetDefinitionAssetTypeProxy.
Several amounts of effort went into the newer design of UAssetDefinition to make it easier to change over time, more things are structs now for input and output so additional parameters can be added.

AssetDefinition module is an editor module instead of being a developer module.
AssetDefinition does not include a myraid of things it shouldn't such as the blueprint module and UnrealEd.

#jira UE-165574
#preflight 636c0ec4d0174259cca85e37

[CL 23083536 by nick darnell in ue5-main branch]
2022-11-10 13:13:41 -05:00
bob tellez
635e0d776e [Backout] - CL23068129 and 23069638
[FYI] Nick.Darnell
Original CL Desc
-----------------------------------------------------------------
AssetDefinition - This is the seed of a long term replacement of IAssetTypeActions.  IAssetTypeActions is woefully inadiquit now.  It puts a lot of functionality in one place, which wouldn't be a terrible thing, except for the GetActions, and some of the menu stuff being built into this class.  We need to make an effort to not have to load every single asset just to open the context menu you have selected, to-wit, a previous CL made it so that summoning the menu no longer *Had* to load the assets, however several remaining issues remained with the Blueprint Utility Actions, and the fact that we don't "KNOW" if we need to call GetActions for an asset.  We could introduce a replacement in the class, but that would just get inherited, causing other issues.  So instead the parallel UObject based AssetDefinition now exists.  In large part it will probably be very similar to the other one, but several things in it probably need to chnage.  For now there is a bridging concept in the form of the AssetDefinitionAssetTypeProxy.

Several amounts of effort went into the newer design of UAssetDefinition to make it easier to change over time, more things are structs now for input and output so additional parameters can be added.

AssetDefinition module is an editor module instead of being a developer module.
AssetDefinition does not include a myraid of things it shouldn't such as the blueprint module and UnrealEd.

#jira UE-165574
#preflight 636c0ec4d0174259cca85e37

[CL 23072024 by bob tellez in ue5-main branch]
2022-11-10 01:18:44 -05:00
nick darnell
0e899086d6 AssetDefinition - Doing some additional tweaking to the base asset definition type, and shifting some stuff around, fixing some unity build issues...etc. *mop* *mop* *mop*
#jira UE-165574

[CL 23072005 by nick darnell in ue5-main branch]
2022-11-10 01:17:52 -05:00
nick darnell
fd6f4a29b1 AssetDefinition - This is the seed of a long term replacement of IAssetTypeActions. IAssetTypeActions is woefully inadiquit now. It puts a lot of functionality in one place, which wouldn't be a terrible thing, except for the GetActions, and some of the menu stuff being built into this class. We need to make an effort to not have to load every single asset just to open the context menu you have selected, to-wit, a previous CL made it so that summoning the menu no longer *Had* to load the assets, however several remaining issues remained with the Blueprint Utility Actions, and the fact that we don't "KNOW" if we need to call GetActions for an asset. We could introduce a replacement in the class, but that would just get inherited, causing other issues. So instead the parallel UObject based AssetDefinition now exists. In large part it will probably be very similar to the other one, but several things in it probably need to chnage. For now there is a bridging concept in the form of the AssetDefinitionAssetTypeProxy.
Several amounts of effort went into the newer design of UAssetDefinition to make it easier to change over time, more things are structs now for input and output so additional parameters can be added.

AssetDefinition module is an editor module instead of being a developer module.
AssetDefinition does not include a myraid of things it shouldn't such as the blueprint module and UnrealEd.

#jira UE-165574
#preflight 636c0ec4d0174259cca85e37
[REVIEW]

[CL 23072002 by nick darnell in ue5-main branch]
2022-11-10 01:17:07 -05:00