Commit Graph

604 Commits

Author SHA1 Message Date
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
Jason Nadro
fc3dcee397 Restore backed out CL, with fixes.
Also restores follow-up CLs 19973746, 19973782
FStaticParameterSet::MaterialLayers can't be deprecated, since a property with the same name is included via FStaticParameterSetRuntimeData
So instead, FMaterialLayersFunctionsRuntimeData is updated with SerializeFromMismatchedTag, to allow serializing a full FMaterialLayersFunction.
When this happens, the EditorOnly portion is stored in a separate heap allocation, and then transferred to FStaticParameterSet::EditorOnly::MaterialLayers
#preflight 626c3405e31dbb512cef1e98

[Backout] - CL19973745
#fyi bob.tellez
Original CL Desc
-----------------------------------------------------------------
[Backout] - CL19964485
#fyi Ben.Ingram
Original CL Desc
-----------------------------------------------------------------
Add 'Optional' EditorOnly data for UMaterialInterface and UMaterialFunctionInterface
These are separate UObject hierarchies that store editor-only UPROPERTIES, but can be included with cooked content, which allows full editor support.
In principle, all editor-only properties could be moved over.  So far, this has been limited to UMaterialExpressions, and data related to material parameters.
FStaticParameterSet, FMaterialLayersParameters, and FMaterialCachedExpressionData have all been split into separate editor-only/non-editor-only classes,
which allows the editor-only portion to be stored on the optional editor-only UObject.
#preflight 626ab21dad56c0cbbea32dc4
#rb jason.nadro, francis.hurteau
#jira FORT-463329

[CL 20043286 by Jason Nadro in ue5-main branch]
2022-05-04 12:21:52 -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
Patrick Enfedaque
eaf42e1a5a Fix Non-unity: missing include
#jira UE-150834
#rb none
#preflight skip
#rnx

[CL 20011576 by Patrick Enfedaque in ue5-main branch]
2022-05-02 13:28:08 -04:00
Patrick Enfedaque
33cce03c97 Fix regression that prevents opening a mapA from CB without saving currently unsaved mapB
#jira UE-150417
#rb richard.malo
#preflight skip
#rnx

[CL 19976898 by Patrick Enfedaque in ue5-main branch]
2022-04-29 08:32:50 -04:00
bob tellez
34d8d5badd [Backout] - CL19964485
#fyi Ben.Ingram
Original CL Desc
-----------------------------------------------------------------
Add 'Optional' EditorOnly data for UMaterialInterface and UMaterialFunctionInterface
These are separate UObject hierarchies that store editor-only UPROPERTIES, but can be included with cooked content, which allows full editor support.
In principle, all editor-only properties could be moved over.  So far, this has been limited to UMaterialExpressions, and data related to material parameters.
FStaticParameterSet, FMaterialLayersParameters, and FMaterialCachedExpressionData have all been split into separate editor-only/non-editor-only classes,
which allows the editor-only portion to be stored on the optional editor-only UObject.
#preflight 626ab21dad56c0cbbea32dc4
#rb jason.nadro, francis.hurteau
#jira FORT-463329

[CL 19973745 by bob tellez in ue5-main branch]
2022-04-28 20:08:12 -04:00
Ben Ingram
448b0a9807 Add 'Optional' EditorOnly data for UMaterialInterface and UMaterialFunctionInterface
These are separate UObject hierarchies that store editor-only UPROPERTIES, but can be included with cooked content, which allows full editor support.
In principle, all editor-only properties could be moved over.  So far, this has been limited to UMaterialExpressions, and data related to material parameters.
FStaticParameterSet, FMaterialLayersParameters, and FMaterialCachedExpressionData have all been split into separate editor-only/non-editor-only classes,
which allows the editor-only portion to be stored on the optional editor-only UObject.
#preflight 626ab21dad56c0cbbea32dc4
#rb jason.nadro, francis.hurteau
#jira FORT-463329

[CL 19964485 by Ben Ingram in ue5-main branch]
2022-04-28 12:56:28 -04:00
Patrick Enfedaque
41059f0042 World: Allow Subsystem initialization on EWorldType::Inactive
-  UWorldSubsystem::DoesSupportWorldType still doesn't support EWorldType::Inactive so behavior remains unchanged
-  WorldPartitionCookPackageSplitter now initializes the world if it isn't already so that UDataLayerSubsystem is initialized at cook time
-  Remove remaining code path where same world could be reused if it was initialized as inactive (Opening unsaved new level in content browser will now require saving first)

#jira none
#rb richard.malo, jeanfrancois.dube
#preflight 62669d3a0634d0904cdba283
#test CitySample, AncientWorld

[CL 19917858 by Patrick Enfedaque in ue5-main branch]
2022-04-26 07:05:21 -04:00
kiaran ritchie
f21713720e Adding ability to batch replace missing skeleton asset.
#JIRA UE-149593
#rb thomas.sarkanen
#preflight

[CL 19904145 by kiaran ritchie in ue5-main branch]
2022-04-25 12:30:42 -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
Patrick Enfedaque
d31019c9e9 - FLinkerInstancingContext: Add Tag support
- Use FLinkerInstancingContext Tag to load all external actors instead of using a global map

#rb richard.malo, jeanfrancois.dube, francis.hurteau
#preflight 624aea29c51908059ae6b82f
#rnx

[CL 19607995 by Patrick Enfedaque in ue5-main branch]
2022-04-04 09:31:43 -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
patrick enfedaque
7599f90f04 Fixup Redirectors: Fix GCed Empty Packages crash (fix one other use case in FAssetRenameManager that I previously missed)
#jira UE-142999
#rb richard.malo
#preflight 621631920f71e491ccf76408
#lockdown aurel.cordonnier
#rnx


#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 19093419 via CL 19093997 via CL 19094653 via CL 19096144 via CL 19105377
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19146681 by patrick enfedaque in ue5-main branch]
2022-02-25 09:44:15 -05:00
Alexis Matte
9775bb4fbd Add Interchange support for Import geo/skinning only workflow
#UETOOL-4729
#rb richard.talbotwatkin
#rnx
#preflight 62178d841a114ad504392e3f

[CL 19112941 by Alexis Matte in ue5-main branch]
2022-02-24 09:10:50 -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
kiaran ritchie
b75fa77bb5 Fixes issue replacing skeleton on AnimBP that is missing skeleton asset.
#JIRA https://jira.it.epicgames.com/browse/UE-141917
#preflight 6207067aab22f3d80a56c666
#rb halfdan.ingvarsson

#ROBOMERGE-AUTHOR: kiaran.ritchie
#ROBOMERGE-SOURCE: CL 18968991 in //UE5/Release-5.0/... via CL 18969265 via CL 18969586
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v917-18934589)

[CL 18969610 by kiaran ritchie in ue5-main branch]
2022-02-11 20:50:24 -05:00