Commit Graph

197 Commits

Author SHA1 Message Date
geoff evans
bd2a5c3af2 Detect broken Blueprint assets and abort Migration if they are included.
The condition here mimics the condition we use when we advise caution about opening the Blueprint Editor on the same assets.

Use Force Delete to null out references and unload assets so we can delete the package files that Migrate generated.

#rnx
#rb steve.robb
#jira UE-142833
#preflight 62100735eb1ea1b2cce404d1

[CL 19103703 by geoff evans in ue5-main branch]
2022-02-23 17:53:45 -05:00
geoff evans
1f87d3a2fd Second pass on SlowTask dialogs for Migrate.
Move LoadAssets to after the UI prompts for the UX benefit.

#rnx
#rb trivial
#preflight 620e84137d6fd1dfc4525eae
#jira UE-142832

[CL 19036708 by geoff evans in ue5-main branch]
2022-02-17 12:31:56 -05:00
geoff evans
f2a3a563a1 Treat Engine content more intelligently when Migrating/Consolidating assets.
### AssetTools
Check each package's mount point and fold that against each Plugin's LoadedFrom (Project or Engine)
If Engine content is visible in the Content Browser, show but do not schedule Engine Plugin content for Migration
Add support for sending in "ShouldMigratePackage" state to SPackageReportDialog

### SPackageReportDialog
Remove "Active" state -> this dialog used to associate Disabled tree item state with the state of not Migrating a package. Just rely on the check state to dictate if a package will be Migrated
Add support for indeterminate checkbox state for folders within the dialog when some, but not all, children being selected for migration
Add logic for initial check/indeterminate/unchecked state and when check state changes on an item
Propagate check state up the hierarchy from the check change event item

#rnx
#rb rex.hill
#jira UE-142543
#preflight 620d6a3926435e00d2de7d3f

[CL 19023118 by geoff evans in ue5-main branch]
2022-02-16 16:36:47 -05:00
geoff evans
9dce602b34 Add SlowTask dialogs, Fix cleaning up temp assets
#rnx
#rb trivial
#preflight 620c232a565043444cacf7a4
#jira UE-142832, UE-142833

[CL 19005530 by geoff evans in ue5-main branch]
2022-02-15 17:37:11 -05:00
geoff evans
3026b21079 Migrate: Fix flattening of assets into the target folder during consolidate
DuplicateObjects takes the destination path very literally, flattening objects to a single folder. Instead, loop over all the objects, calculate the correct relative path, and duplicate the objects one-by-one.

#rnx
#rb rex.hill
#preflight 620be74c475fb819ddc7c756
#jira UE-142545

[CL 18999816 by geoff evans in ue5-main branch]
2022-02-15 13:50:24 -05:00
Alexis Matte
5a6a855dcd Scene node will now only serialize the local transform, all SetGlobalTransform functions has been removed.
Fix scene import when there is no specified factory
The scene node specialtype attribute can now be a "Transform" type. This allow the generic scene pipeline to found group transform node.

#jira none
#rb jeanmichel.dignard, richard.talbotwatkin
#rnx
#preflight 62066e4054003c49ad37c388

[CL 18951547 by Alexis Matte in ue5-main branch]
2022-02-11 09:16:05 -05:00
JeanMichel Dignard
0a111a1b4e Interchange
- Interchange now adds its supported extensions to the import and import into level file pickers.
- Added a GetSupportedFormats on the Interchange Translators.
- UInterchangeTranslatorBase::CanImportSource now defaults to checking the file extension and matching it against the supported formats.
- Added a translator type on the translators to indicate what type of data they can translate (assets or actors for now). This is used by the file pickers to indicate which extensions they want to gather.
#preflight 6203eaca174d2620c3c11d9b

[CL 18919107 by JeanMichel Dignard in ue5-main branch]
2022-02-09 11:43:32 -05:00
geoff evans
1358c3138b Support for migrating selected assets and their dependencies that are inter-referential across content roots.
Assets spread across content roots are migrated into the corresponding content root in the destination, if it exists. If any don't exist, migrate the selection and dependencies to temporary packages into a folder that is migrated to the destination.

== Notes ==

AssetTools.h/cpp
* Remove OriginalRoot filtering down reference gathering to objects in the selected object package's content root (opens up the routine to migrating plugin content)
* Trawl the set of objects to migrate and compare their content root against the available content roots in the destination project's plugin directory hierarchy
* If some plugins are missing from the destination, prompt the user to consolidate everything into a temporary folder
* If the user selects to consolidate we duplicate objects and fixup references to those duplicates, and save those packages to a folder named by the user
* If necessary copy those temporary packages to the destination content root
* Tidy up any temporary packages saved into the source project

[FYI] michael.noland
#rb francis.hurteau
#jira UE-115684
#preflight 61f4720f6b5aea38e5c653e5

#ROBOMERGE-AUTHOR: geoff.evans
#ROBOMERGE-SOURCE: CL 18779963 in //UE5/Release-5.0/... via CL 18780829 via CL 18781338
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18781642 by geoff evans in ue5-main branch]
2022-01-28 19:47:50 -05:00
marc audy
6553e6cd0a Remove as much C++ deprecation as possible up to 4.17 (along with a few scattered removals from beyond)
#preflight 61eefc77ba69a4fdb220bf23

#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 18712765 in //UE5/Release-5.0/... via CL 18712784 via CL 18713147
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18713191 by marc audy in ue5-main branch]
2022-01-24 15:07:48 -05:00
thomas sarkanen
145f40d998 Fixed cooked anim BP assets not animating when placed
Also fixed up cooked anim BPs to display their specific class type.
Also re-instated fix for placing cooked anim BPs in the viewport. Added in CL 18465876, accidentally removed in CL 18589986.

#jira UE-115948 - Cooked Animation Blueprint can't be placed into the Level Viewport.
#jira UE-139349 - Cooked content in editor - Animation blueprint has incorrect initial pose after cooking
#rb Jurre.deBaare
#preflight 61e59bab87389804e5655061

#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 18633747 in //UE5/Release-5.0/... via CL 18633755 via CL 18633767
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v899-18417669)

[CL 18637387 by thomas sarkanen in ue5-main branch]
2022-01-18 04:32:10 -05:00
zach rammell
7dc312effd [AssetTools] Replace/remove uses of whitelist/blacklist
#jira UE-131115
#rb patrick.laflamme
#preflight 61e1c4d081234b3e06031798

[CL 18621523 by zach rammell in ue5-main branch]
2022-01-14 14:22:47 -05:00
richard malo
481f65fe16 New Actor Folders objects.
- When enabled, folders are actual objects : modifying a folder won't affect actors (more compliant with OFPA).
- Enabled by default for World Partition and Level Instances.
- Can be enabled on regular levels (experimental feature 'Use Actor Folder Objects').
- If Level uses OFPA, ActorFolders will also be saved in their own package (but will use __ExternalObjects__ root folder).
- In a future refactoring, external actors will also be moved in the same root folder.
- Generalized saving object in an external package (different from its outer package)
- World outliner supports old folders and new actor folder objects : Levels using the actor folder objects will show a root Level node (like Level Instances).
#rb patrick.enfedaque, jeanfrancois.dube
#preflight 61d84b356511bc498e5cb858

#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 18543443 in //UE5/Release-5.0/... via CL 18543482
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18543525 by richard malo in ue5-release-engine-test branch]
2022-01-07 10:01:19 -05:00
julien stjean
c9ff073b14 Added a function ImportAssetsWithDialogAsync to the AssetTools.
Changed two import calls in the editor where interchange wasn't used. ImportAssetsWithDialog doesn't support async import to avoid breaking existing automation scripts or code.

#jira UE-136698
#rb Alexis.Matte
#preflight 61d340472e0e436c7257dbe4

#ROBOMERGE-AUTHOR: julien.stjean
#ROBOMERGE-SOURCE: CL 18503230 in //UE5/Release-5.0/... via CL 18503245
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18503259 by julien stjean in ue5-release-engine-test branch]
2022-01-03 15:53:45 -05:00
jay nakai
40b1c3949f Fix for editor crash in PerformDuplicateAsset() caused by PackageName string with "//" in path being passed to CanCreateAsset().
Specific crash happened when PackageName string was created from PackagePath + TEXT("/") + AssetName, and PackagePath ended with "/" char; resulting in a package name with "//" in the body. This specific condition is checked for in CreatePackage() and when found results in a fatal log error being thrown.

Fixed by changing PackageName string to build using the / operator which prevents "//" in the result string

#rb Bob.Tellez
#rb Brooke.Hubert
#rb David.Hamm

#ROBOMERGE-AUTHOR: jay.nakai
#ROBOMERGE-SOURCE: CL 18454673 via CL 18454689 via CL 18454712 via CL 18456548 via CL 18456568
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v898-18417669)

[CL 18456591 by jay nakai in ue5-release-engine-test branch]
2021-12-14 13:34:08 -05:00
Marc Audy
f512a6d461 Eliminate whitespace only differences between Release-Engine-Staging and Release-Engine-Test
#fyi Aurel.Cordonnier

[CL 18448630 by Marc Audy in ue5-release-engine-test branch]
2021-12-13 15:59:48 -05:00
julien stjean
0af64fa975 Stop interchange from being use when using asset tool api by defaul (when interchange is on). (Otherwise this would break some licensees made code and scripts). Those who want an async import should use the interchange api preferably.
Added a setting to turn on interchange import only for textures.

The selection of the asset in the content is now only done after all the asset are imported when using interchange.

#jira UETOOL-4291
#rb Alexis.Matte
#preflight 619e34820141b3c6da5b98d0

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

[CL 18282740 by julien stjean in ue5-release-engine-test branch]
2021-11-24 08:15:47 -05:00
jeremy moore
8792e4b0d7 #jira UE-12502
Move ComputeFramework into its own plugin.
#preflight 619bddd0f934c1a291daae39

#ROBOMERGE-AUTHOR: jeremy.moore
#ROBOMERGE-SOURCE: CL 18262262 in //UE5/Release-5.0/... via CL 18262318
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18262322 by jeremy moore in ue5-release-engine-test branch]
2021-11-22 15:33:48 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
mike beach
d941fbab4f Minimal editor changes from a partner branch.
#rb Alexis.Matte, Lauren.Barnes
#preflight 618d8c2fd9223ebb46cb8b64

#ROBOMERGE-AUTHOR: mike.beach
#ROBOMERGE-SOURCE: CL 18159259 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v889-18060218)

[CL 18159342 by mike beach in ue5-release-engine-test branch]
2021-11-11 17:03:15 -05:00
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05: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
julien stjean
473da44907 Made the asset tools able to handle a invalid package path or to convert it to a package path when possible.
#jira UE-119981
#preflight 614badc029828100016dbaf0
#rb JeanMichel.Dignard

#ROBOMERGE-AUTHOR: julien.stjean
#ROBOMERGE-SOURCE: CL 17695045 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v875-17642767)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 17695171 by julien stjean in ue5-release-engine-test branch]
2021-10-01 15:16:52 -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
julien stjean
d37a1a36bb Allow better scripting of interchange for the automation by adding some callback when a asset or a scene object is created and when the import is completed.
Updated the PinHiddenByDefault uproperty metadata to work in blueprint struct ouside of animation blueprint.

#jira UETOOL-4035
#rb Phillip.Kavan, Alexis.Matte
#preflight 6144a8b03c7c6700010df23e

#ROBOMERGE-AUTHOR: julien.stjean
#ROBOMERGE-SOURCE: CL 17553215 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17553235 by julien stjean in ue5-release-engine-test branch]
2021-09-17 11:53:51 -04:00
ben ingram
2351588c6a Add texture cube array assets, support for sampling in materials
#rb graham.wihlidal
#preflight 611ebf1a2c1f1c0001355fe7

#ROBOMERGE-OWNER: ben.ingram
#ROBOMERGE-AUTHOR: ben.ingram
#ROBOMERGE-SOURCE: CL 17240322 via CL 17268789
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v858-17259218)

[CL 17268797 by ben ingram in ue5-release-engine-test branch]
2021-08-23 12:36:17 -04:00