Commit Graph

206 Commits

Author SHA1 Message Date
patrick enfedaque
01c2ef582d Rework 13645015:
- Only call FAssetRegistryModule::AssetCreated if necessary
- Call FAssetRegistryModule::AssetCreated before save so that saved packages doesn't end up with PKG_NewlyCreated flag

#rb bob.tellez
#preflight 627bf0630a5817c9d9525434

#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 20146875 via CL 20147079 via CL 20147762
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20149912 by patrick enfedaque in ue5-main branch]
2022-05-11 16:55:57 -04:00
Matt Peters
7ad238a806 AssetRegistry includes (Engine/Source): change #include "AssetData.h" -> #include "AssetRegistry/AssetData.h", and similar for the other moved AssetRegistry headers.
#rb Zousar.Shaker
#rnx
#preflight 6270509a220f89f0ad573030

[CL 20016982 by Matt Peters in ue5-main branch]
2022-05-02 18:06:48 -04:00
jason stasik
3ce9c775a2 Allow separate permission lists for viewing and creating assets
#rb rex.hill
#preflight 62574684667d4516642224fa

#ROBOMERGE-AUTHOR: jason.stasik
#ROBOMERGE-SOURCE: CL 19760664 via CL 19762141 via CL 19762160 via CL 19762168
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v939-19570697)

[CL 19802156 by jason stasik in ue5-main branch]
2022-04-18 23:31:34 -04:00
johan torp
5c2624134d Optimize AssetTools AdvancedCopyPackages and add batch versions of ForceReplaceReferences and ConsolidateObjects
331s -> 0.28s to consolidate objects when cloning a small shooting range map

#rb Robert.Manuszewski,Chris.Gagnon,Francis.Hurteau,Jamie.Dale,JeanLuc.Corenthin,Phillip.Kavan

#ROBOMERGE-AUTHOR: johan.torp
#ROBOMERGE-SOURCE: CL 19507095 via CL 19507103 via CL 19507108 via CL 19507110
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v937-19513599)

[CL 19514683 by johan torp in ue5-main branch]
2022-03-25 12:41:16 -04:00
scott nelson
d33b4a0d71 Update create and duplicate behavior in Content Browser for Public/Private state
- API to control default behavior of whether newly created content is made public or private on creation
- Ensure duplication copies original's Public/Private state

#rb Francis.Hurteau
#preflight 623b6f07da56b5683a0b56a4

#ROBOMERGE-OWNER: scott.nelson
#ROBOMERGE-AUTHOR: scott.nelson
#ROBOMERGE-SOURCE: CL 19485709 via CL 19487498 via CL 19498786 via CL 19498791
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v936-19480137)

[CL 19501393 by scott nelson in ue5-main branch]
2022-03-24 15:44:12 -04:00
Matt Peters
c1b46b1fed FAssetData: Callsites need to handle AssetData.GetClass() returning null. Added IsInstanceOf(UClass*) for the common operation GetClass() && GetClass->IsChildOf(BaseClass).
#jira UE-146521
#rb Zousar.Shaker
#rnx
#preflight 623874b789625f06129e466b

[CL 19450936 by Matt Peters in ue5-main branch]
2022-03-21 09:00:36 -04:00
philippe deseve
8218e80ef1 UDataLayer deprecated in favor of UDataLayerInstance & UDataLayerAsset
UDeprecatedDataLayerInstance allows to boot level using deprecated UDataLayers
Worlds using DataLayer can run the DataLayerToAssetCommandlet to transition their existing DataLayers
FActorDataLayer interface is deprecated.
DataLayers Blueprint referencers should now use DataLayerAsset to retrieve DataLayerInstances.
DataLayer Code referencers should now use DataLayerAssets or DataLayerInstance FName to retrieve DataLayerInstances.
DataLayerLabels now only used for display/UI purpose
Relabeling DataLayers is not permitted anymore on new DataLayerInstances (allowed on UDeprecatedDataLayerInstance)
Added Changelist Validation for DataLayers
Added a column to the datalayer outliner showing any data layer errors.

#rb richard.mal jeanfrancois.dube
#preflight 623098c2050dc69468b6a297 (errors only related to lyra, which do not exist in this stream)

#ROBOMERGE-OWNER: philippe.deseve
#ROBOMERGE-AUTHOR: philippe.deseve
#ROBOMERGE-SOURCE: CL 19385808 via CL 19387392
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v926-19321884)

[CL 19389077 by philippe deseve in ue5-main branch]
2022-03-15 13:52:28 -04:00
charles bloom
07d079e290 fix multiple asset importers registered at same priority creates random inconsistency
ImgMedia and normal texture import both registered for EXR
would randomly import one or the other on different runs of Editor
adjust priorities so they are not ambiguous
also add detection and logging to prevent this

#rb Julien.StJean
#preflight 622f441c6131e07703a04ed5

[CL 19373316 by charles bloom in ue5-main branch]
2022-03-14 11:34:50 -04:00
michael noland
674afabc53 Editor: Added a fixup redirectors option that *doesn't* delete the redirectors afterwards, which can be useful for cleaning up a project while others are still actively working and might have created new references to the renamed object
#jira UE-143408
#rb lauren.barnes
#lockdown julien.marchand
#preflight 62215f872c722ee170e2ac96

#ROBOMERGE-AUTHOR: michael.noland
#ROBOMERGE-SOURCE: CL 19258824 in //UE5/Release-5.0/... via CL 19259128
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v924-19243027)

[CL 19263827 by michael noland in ue5-main branch]
2022-03-04 04:10:21 -05:00
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