Commit Graph

705 Commits

Author SHA1 Message Date
jonathan bard
00bb42a672 * Added detection of discrepancies between the landscape material instance's TerrainLayerWeightParameters and the landscape component's weightmap allocations. A recent change (18095319) introduced potential issues with static parameters within landscape component's "parent" material instance constants (the parent MIC of all landscape components from a landscape proxy sharing the same weightmap combination). Loading the map would register these invalid MIC in the proxy's MaterialInstanceConstantMap with a valid layer allocation key, preventing the landscape component from ever "fixing" its MICs until the layer allocation key changed (e.g. by painting with a previously unused layer on a component). When such errors are detected, we now regenerate all of the proxy's material instances in order to update the material and its TerrainLayerWeightParameters with the proper weightmap allocations
* Renamed visibility layer name to "__LANDSCAPE_VISIBILITY__" to centralize/simplify the handling of that special layer's name
* Fixed issue with FixupWeightmaps(), that could trigger invalid weightmap usage validation errors when detecting and deleting unused paint layers in components
* Removed deletion of layers with a null layer info in PostEditChangeProperty since it's done, and in a better way (for the base weightmap allocations and the edit layers ones), in PostRegisterAllComponents's FixupWeightmaps

#jira UE-136054
#tests editor, full QA pass by tim.gautier

#ROBOMERGE-OWNER: jonathan.bard
#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 18394875 via CL 18394909 via CL 18394912 via CL 18395077 via CL 18395102
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v896-18170469)

[CL 18395111 by jonathan bard in ue5-release-engine-test branch]
2021-12-07 10:18:26 -05:00
aditya ravichandran
525710df58 Fix spacing/padding issues on Landscape Mode Spline Details Customization
#rb lauren.barnes
#jira UE-129824
#preflight 61a684716c7d8a7295eac9bb

#ROBOMERGE-AUTHOR: aditya.ravichandran
#ROBOMERGE-SOURCE: CL 18331272 in //UE5/Release-5.0/... via CL 18331345
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18331390 by aditya ravichandran in ue5-release-engine-test branch]
2021-11-30 15:55:00 -05:00
jonathan bard
ecaf3a9f2b Import landscape : put the thumbnails on the left side of the paint layer names to prevent misalignment
#rb sebastien.lussier

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 18328229 via CL 18328232 via CL 18328255 via CL 18329138 via CL 18329222
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18329312 by jonathan bard in ue5-release-engine-test branch]
2021-11-30 14:50:53 -05:00
sebastien lussier
a24d254f9e #jira UE-136102
Crash in import panel for new landscape

#rb jonathan.bard

#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 18328995 in //UE5/Release-5.0/... via CL 18329088
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18329172 by sebastien lussier in ue5-release-engine-test branch]
2021-11-30 14:43:04 -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
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
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
matt kuhlenschmidt
e00117cb0c Touch up of landscape mode styling.
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 17570055 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v871-17566257)

[CL 17570080 by matt kuhlenschmidt in ue5-release-engine-test branch]
2021-09-20 09:23:33 -04:00
matt kuhlenschmidt
5381ca07b4 Fix a number of details panel style issues
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 17543878 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17543897 by matt kuhlenschmidt in ue5-release-engine-test branch]
2021-09-16 16:23:57 -04:00
jonathan bard
a3d07fdb82 Fixed invalid tooltips in landscape
#rb trivial
#jira none
#rnx

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 17491082 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17491095 by jonathan bard in ue5-release-engine-test branch]
2021-09-13 08:43:00 -04:00
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -04:00
jonathan bard
f8ef87b49e Fixed crash in landscape resampling method : regions in ResampleData are specified in quads, not vertices
#rb patrick.enfedaque
#jira UE-118076

#ROBOMERGE-SOURCE: CL 17422108 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17422527 by jonathan bard in ue5-release-engine-test branch]
2021-09-03 11:50:08 -04:00
lauren barnes
5bd8c74d4e FAssetEditorModeUILayer now serves as a layer between a given asset editor and the mode toolkits, so that the mode toolkits can request UI panels and the asset editor determines where they are located in the asset editor layout. The first implementation is in the level editor, and all default mode UI has been moved to FModeToolkit.
#jira UETOOL-3555
#preflight 61143dbf9c7bb10001f080b3
#rb Matt.Kuhlenschmidt

#ROBOMERGE-SOURCE: CL 17152278 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17152291 by lauren barnes in ue5-release-engine-test branch]
2021-08-12 10:54:54 -04:00
ryan bickell
a275e29e1c Fix VT update to happen with rest of landscape painting tools (smooth, flatten, noise)
#rb jeremy.moore
[FYI] jonathan.bard

#ROBOMERGE-SOURCE: CL 16694008 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16694084 by ryan bickell in ue5-release-engine-test branch]
2021-06-16 15:10:28 -04:00
brooke hubert
b09bce4900 Upgraded SAssetDropTarget to deal with drag & drop operations of multiple assets, and deprecated single asset events.
To preserve the old behavior, multiple asset drag drop support is off by default.

#Jira none
#preflight 60b93274771eff0001f04dc4
#review-16552770
#rb lauren.barnes richard.malo

[CL 16587196 by brooke hubert in ue5-main branch]
2021-06-08 10:52:13 -04:00
patrick enfedaque
2f1403f229 Landscape: Fix Import crashes/validation inconsistencies
#jira UE-117378, UE-116938
#rb richard.malo, jonathan.bard
#preflight 60bf6e915bc96f0001bb59a3
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 16586781 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v828-16531559)

[CL 16586790 by patrick enfedaque in ue5-main branch]
2021-06-08 10:18:43 -04:00
danny couture
25c6066c53 Prepare for the deprecation of direct access to the Resource member of UTexture in favor of the GetResource() accessor.
#rb Francis.Hurteau
#preflight 609e5182ef86d30001ad0a18
#rnx

#ROBOMERGE-SOURCE: CL 16328103 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v804-16311228)

[CL 16328107 by danny couture in ue5-release-engine-test branch]
2021-05-14 07:17:49 -04:00
danny couture
9332b64809 Prepare for the deprecation of direct access to the Resource member of UTexture in favor of the GetResource() accessor.
#rb Francis.Hurteau
#preflight 609e5182ef86d30001ad0a18
#rnx

[CL 16328103 by danny couture in ue5-main branch]
2021-05-14 07:17:32 -04:00
jonathan bard
0270cbb1ae Fixed crash when dropping a BP actor with a nested water body actor in a map with a landscape but no water brush and/or water mesh actor: in that case, the addition of the actor will trigger a UWorld::SpawnActor to create the missing actors, which is forbidden during a construction script :
* Changed the API of the actor factory's CreateActor/SpawnActor in order to take a FActorSpawnParameters in parameter, so as to expose UWorld::SpawnActor's own option to the factory user.
* The level pointer is still part of the function prototypes in order to make it explicit to the user that he needs to pass in a valid ULevel (rather than relying on FActorSpawnParameters's OverrideLevel, which is easy to miss). In the case where OverrideLevel is indeed passed within FActorSpawnParameters, the functions validate that the pointer is the same as the level param
* Also, removed automatic creation of water mesh actor on map load : this is not playing well with world partition because it will keep on creating new actors if the level containing the water mesh actor is not loaded

#rb marc.audy, kevin.ortegren
#jira none
#tests editor + full build preflight

[CL 16219600 by jonathan bard in ue5-main branch]
2021-05-06 08:19:17 -04:00
Andrew Davidson
3ddc3a4da3 Merge up from //UE5/Dev-LargeWorldCoordinates
#rb none

[CL 16211417 by Andrew Davidson in ue5-main branch]
2021-05-05 15:07:25 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
dmytro vovk
eab8b64ef1 Removed Scene Software Occlusion
#jira none
#rb Dmitriy.Dyomin

[CL 16158927 by dmytro vovk in ue5-main branch]
2021-04-29 13:14:48 -04:00
brooke hubert
a07892d550 The global mode manager should not be accessed in a commandlet environment.
# Moved access that was in the landscape editor module to the landscape editor mode, and added a check which should help better track down invalid access in the future, until we can clean up the global mode tools completely.

#Jira UE-114232
#preflight 6089b7312377910001349bc2
#rb lauren.barnes matt.peters
#fyi patrick.enfedaque

[CL 16148842 by brooke hubert in ue5-main branch]
2021-04-28 17:03:50 -04:00
Patrick Enfedaque
a127941502 Landscape: Highlight landscape proxy bounds in the New/Import landscape tool (based on WorldPartitionGridSize setting)
#rb richard.malo

[CL 16143804 by Patrick Enfedaque in ue5-main branch]
2021-04-28 10:49:34 -04:00