Commit Graph

16 Commits

Author SHA1 Message Date
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
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
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
aurel cordonnier
34f55d3a4a Merge from Release-Engine-Test @ 17946149 to UE5/Main
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17949667 by aurel cordonnier in ue5-main branch]
2021-10-27 15:14:40 -04:00
JeanMichel Dignard
6fc97832a9 Fixed crash during USD MDL material creation where a UTexture was being garbaged collected when it was still needed. Don't duplicate a texture that's in the transient package during VT conversion since it's not engine content and it's propably not RF_Standalone.
Also made sure each material has it's own package as the current setup was to have package for the module with all the materials in it which lacked a proper root object.

#rb Julien.StJean, JeanLuc.Corenthin
#robomerge 5.0

[CL 17683984 by JeanMichel Dignard in ue5-main branch]
2021-09-30 17:38:53 -04:00
Zousar Shaker
80cdb54f19 Avoid overhead from access tracking on wrapped object pointers during high frequency operations related to materials at cook time.
Also go back to using Cast/CastChecked/ExactCast as these have now been made more efficient for use with wrapped object pointers.

#rb ben.ingram
#preflight 6075d5d70a49b7000126f5b3

[CL 15993517 by Zousar Shaker in ue5-main branch]
2021-04-13 15:47:11 -04:00
Zousar Shaker
a79239f69d Avoid excessive access tracking overhead during cook caused by TObjectPtr accesses in the material code.
#rb ben.ingram
#preflight 606e2db48c8140000112e318

[CL 15948055 by Zousar Shaker in ue5-main branch]
2021-04-07 19:08:58 -04:00
Ben Ingram
72b567de9c During VT texture conversion, call UTexture::Modify() before making changes rather than after
This is correct usage, important now due to async texture changes
#rb none
#jira none

[CL 14831642 by Ben Ingram in ue5-main branch]
2020-12-01 18:20:19 -04:00
Michal Valient
95d19f95b1 [REVERB] Merging //UE4/Private-Reverb-Development@13832732
#rb graham.wihlidal, rune.stubbe, brian.karis, andrew.lauritzen, jeff.farris

[CL 13834854 by Michal Valient in ue5-main branch]
2020-07-06 18:58:26 -04:00
uriel doyon
0778bcd275 Registered references held by FVTConversionWorker to prevent GC issues.
#jira UE-91853
#lockdown cristina.riveron
#rb ben.ingram

#ROBOMERGE-SOURCE: CL 13184739 in //UE4/Release-4.25/... via CL 13184774 via CL 13184789
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v688-13145358)

[CL 13184821 by uriel doyon in Main branch]
2020-05-05 15:05:40 -04:00
ryan durand
471d972e62 Updating copyright for Engine Developer.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870584 by ryan durand in Main branch]
2019-12-26 15:32:37 -05:00
benoit deschenes
22f347d191 Integrating CL 7700278
Fixing opacity mask using Virtual Textures at Datasmith import

#jira UE-78125
#rb Alexis.Matte

#ROBOMERGE-SOURCE: CL 7703036 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v384-7690951)

[CL 7703044 by benoit deschenes in Main branch]
2019-08-01 18:07:08 -04:00
jamie dale
dd6213fb22 Fixed localization gather warnings
#jira
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 7072335 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7072359 by jamie dale in Main branch]
2019-06-18 16:41:05 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00