Commit Graph

730 Commits

Author SHA1 Message Date
luc eygasier
a4580ce238 Adds default layer info object setting. Allowing to automatically create Layer Info by cloning the default object when creating a new landscape:
* Unifies the different places creating a Layer Info Object or accessing "sharedassets".
* Fixes UEFN not able to access created LayerInfo objects in the ContentBrowser
* Adds the ability to create Landscape Layer Info Object as a regular asset (ie: without the landscape editor). Needed for example to create a Default LandscapeLayerInfoObject

#preflight 628ff637911f194ea743c6f3
#rb Jonathan.Bard

#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 20395352 via CL 20395370 via CL 20395392 via CL 20395403
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v949-20362246)

[CL 20398733 by luc eygasier in ue5-main branch]
2022-05-27 16:50:43 -04:00
Leon Huang
19877e39c5 Fix for duplicate localization key warnings and missing localization defines/undefines in various files.
#rnx
#rb: Vincent.Gauthier
#jira: UE-151614
#preflight: 628fc4a98c23e52ef0fdfa7d

[CL 20384450 by Leon Huang in ue5-main branch]
2022-05-26 16:11:10 -04:00
robert manuszewski
f8a812a32f Converting hardcoded short class/enum names to pathnames ahead of ANY_PACKAGE removal
#rb trivial
#jira UE-99463
#preflight 6288fd998828ea88c8aef3d0

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 20314896 via CL 20314897 via CL 20314903 via CL 20314904
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v948-20297126)

[CL 20315214 by robert manuszewski in ue5-main branch]
2022-05-22 10:30:02 -04:00
luc eygasier
6923e981eb Adds Default Landscape Material to be used in LandscapeEditor when creating a new landscape
#preflight 6286aff4286cf1867a0ccf40
#rb Jonathan.Bard

#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 20294036 via CL 20294043 via CL 20294053 via CL 20294056
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v948-20297126)

[CL 20305112 by luc eygasier in ue5-main branch]
2022-05-20 18:54:31 -04:00
jonathan bard
53e57a6edc Landscape splines tool : added buttons to select all spline segments or control points
#rb luc.eygasier
#jira UE-151398
#preflight 62836cde3f6aa88b1a719be2

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 20263904 via CL 20264040 via CL 20264126
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20269329 by jonathan bard in ue5-main branch]
2022-05-18 17:59:30 -04:00
luc eygasier
8f5e6ffb66 Adds Landscape resolution restriction when in Restricted Mode (example: UEFN), preventing to create landscape if the wanted resolution exceed currently supported safe limits.
Applied to:
* New Landscapes, new imported landscape
* Import Landscape tool
* Add component tool

#jira UE-149015
#preflight 627e98d97c26e247735ca7d1
#rb Michael.Balzer, Jonathan.Bard

#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 20187875 via CL 20189504 via CL 20189506 via CL 20189507
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20191648 by luc eygasier in ue5-main branch]
2022-05-13 18:58:05 -04:00
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
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
ryan bickell
7f7e7ed8ad Fix import descriptor not refreshing when toggling Flip Y Axis setting from ImportExport tool. Also, made option to flip coordinate on Y axis available when exporting tiled landscape.
#rb jonathan.bard
#jira none
#robomerge FNMain
#preflight 6244bd3d8f06610224fc9572

[CL 19570855 by ryan bickell in ue5-main branch]
2022-03-31 06:09:31 -04:00
zach bethel
50274e3050 Converted FIntPoint / FIntVector / FIntRect to a template type and added unsigned variants.
#rb luke.thatcher, andrew.davidson, steve.robb
#preflight 6239e9d204769ab49354a30f

[CL 19468937 by zach bethel in ue5-main branch]
2022-03-22 13:40:58 -04:00
michael balzer
695b291e78 Landscape: Use same edge handles and colors for importing landscape as for new landscape; refactor line drawing code
#preflight 622a52a1641a55d78f4dbd68
#rb jonathan.bard

[CL 19340291 by michael balzer in ue5-main branch]
2022-03-10 14:47:23 -05:00
michael balzer
f3ba869f73 Landscape: Fix resizing of new or imported landscapes by dragging the boundaries
#preflight 62266b638d18d26686052e88
#rb jonathan.bard

[CL 19297606 by michael balzer in ue5-main branch]
2022-03-07 20:28:19 -05:00
luc eygasier
643ed6eea9 Undo //UE5/Main/Engine/Source/... changelist 19235312
Fixes uninitialized member in FLandscapePerLODMaterialOverride

#rb Jonathan.Bard
#jira UE-144566
#preflight 6220c3397e0217a606ee7545

Original CL Desc
* Removed incomplete per-platform per-LOD level material overrides for landscape. The code isn't meant to support that since material instances are built at edit-time. We would need to somewhat hack it at cook time in order to regenerate (and recompile) the list of material instances per-platform, which is not a recommended thing to to in the engine. Instead, we choose to simply make the per-LOD level material overrides constant across platforms since the recommended way is to customize the material for platforms using material expressions such as Quality Level switc, Shading Path Switc or Feature Level Switc.
* Deprecated/merged FLandscapeComponentMaterialOverride and FLandscapeProxyMaterialOverride into FLandscapePerLODMaterialOverride since they were identical
* Fixed UpdateLayersMaterialInstances which, unlike UpdateMaterialInstances, didn't take into account per-component material overrides

[CL 19242882 by luc eygasier in ue5-main branch]
2022-03-03 08:55:00 -05:00
eric mcdaniel
78d6c0d3f5 [Backout] - CL19230219
#rb none
#jira UE-144566
#preflight 62200fba943787f1d21ae8ae

#fyi luc.eygasier, Jonathan.Bard
Original CL Desc
-----------------------------------------------------------------
* Removed incomplete per-platform per-LOD level material overrides for landscape. The code isn't meant to support that since material instances are built at edit-time. We would need to somewhat hack it at cook time in order to regenerate (and recompile) the list of material instances per-platform, which is not a recommended thing to to in the engine. Instead, we choose to simply make the per-LOD level material overrides constant across platforms since the recommended way is to customize the material for platforms using material expressions such as Quality Level switc, Shading Path Switc or Feature Level Switc.
* Deprecated/merged FLandscapeComponentMaterialOverride and FLandscapeProxyMaterialOverride into FLandscapePerLODMaterialOverride since they were identical
* Fixed UpdateLayersMaterialInstances which, unlike UpdateMaterialInstances, didn't take into account per-component material overrides

From shelve 17931928 on behalf on Jonathan.Bard

#rb Jonathan.Bard
#jira UE-132031
#preflight 621cd5cd49723678579d9ec1

#ROBOMERGE-OWNER: luc.eygasier
#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 19221589 via CL 19223810 via CL 19223838 via CL 19226205
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19235312 by eric mcdaniel in ue5-main branch]
2022-03-02 20:08:32 -05:00
luc eygasier
e78d41114a * Removed incomplete per-platform per-LOD level material overrides for landscape. The code isn't meant to support that since material instances are built at edit-time. We would need to somewhat hack it at cook time in order to regenerate (and recompile) the list of material instances per-platform, which is not a recommended thing to to in the engine. Instead, we choose to simply make the per-LOD level material overrides constant across platforms since the recommended way is to customize the material for platforms using material expressions such as Quality Level switc, Shading Path Switc or Feature Level Switc.
* Deprecated/merged FLandscapeComponentMaterialOverride and FLandscapeProxyMaterialOverride into FLandscapePerLODMaterialOverride since they were identical
* Fixed UpdateLayersMaterialInstances which, unlike UpdateMaterialInstances, didn't take into account per-component material overrides

From shelve 17931928 on behalf on Jonathan.Bard

#rb Jonathan.Bard
#jira UE-132031
#preflight 621cd5cd49723678579d9ec1

#ROBOMERGE-OWNER: luc.eygasier
#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 19221589 via CL 19223810 via CL 19223838 via CL 19226205
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19230219 by luc eygasier in ue5-main branch]
2022-03-02 16:51:01 -05:00
jonathan bard
dc0273093d Landscape edit layers local merge fixes :
* Fixed assert when updating heightmaps of different sizes
* Fixed crash when deleting components : the deleted components were still referenced in the shared weightmap texture usages

Misc:
* Properly delete edit layers heightmaps and weightmaps when deleting landscape components

#rb luc.eygasier
#jira UE-140551
#preflight 62164eea37178b0175ac9cf9

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 19094154 via CL 19100022 via CL 19100646 via CL 19109891
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19147208 by jonathan bard in ue5-main branch]
2022-02-25 10:09:16 -05:00
matt oztalay
0d516681b3 Adding a case for the Layer Context Menu to raise a little notification when right-clicking on heightmaps in WP levels to point users to Manage -> Import instead.
#jira UE-137786
#preflight 61fd7006a6165e535683494c
#rb Jonathan.Bard
#lockdown aurel.cordonnier

#ROBOMERGE-AUTHOR: matt.oztalay
#ROBOMERGE-SOURCE: CL 18871687 in //UE5/Release-5.0/... via CL 18871698 via CL 18871886
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v910-18824042)

[CL 18871907 by matt oztalay in ue5-main branch]
2022-02-04 15:36:30 -05:00
robert manuszewski
97b5e82c0b Deprecating EInternalObjectFlags::PendingKill. Making sure iterators use the appropriate flags based on the current state of PendingKill being enabled or not.
#preflight 61f8f33d537702981c352c7a
#rb Steve.Robb

#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 18806353 in //UE5/Release-5.0/... via CL 18808526 via CL 18821789
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v908-18788545)

[CL 18822151 by robert manuszewski in ue5-main branch]
2022-02-02 02:21:12 -05:00
andrew davidson
3debbbd465 Fix FVector2D variant casts
Submitted on behalf of fred.kimberley
#rb andy.davidson
#preflight 61f8719ea6632a34f35e654b

#ROBOMERGE-AUTHOR: andrew.davidson
#ROBOMERGE-SOURCE: CL 18801709 in //UE5/Release-5.0/... via CL 18802160 via CL 18821533
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v908-18788545)

[CL 18821619 by andrew davidson in ue5-main branch]
2022-02-02 01:45:23 -05:00
jonathan bard
c3071749ee Fixed non-unity build
#rb none
#rnx

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 18734963 via CL 18734966 via CL 18734974 via CL 18735549 via CL 18735804
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18735842 by jonathan bard in ue5-main branch]
2022-01-26 10:50:28 -05:00
jonathan bard
4d69d43831 Clear selected landscape components in the details panel when clearing the selection
#rb sebastien.lussier
#jira UE-140166
#preflight 61f14fc77266f4e79bcfb1fb

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 18734703 in //UE5/Release-5.0/... via CL 18734706 via CL 18734793
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18734794 by jonathan bard in ue5-main branch]
2022-01-26 08:54:04 -05:00
sebastien lussier
379222cb50 FLandscapeToolFlatten - Only create preview component when sculpting
* Flatten preview is never shown when painting
#jira none
#rb jonathan.bard
#preflight 61f04e47ff453b751b4122c4

#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 18726657 in //UE5/Release-5.0/... via CL 18726671 via CL 18726843
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18726851 by sebastien lussier in ue5-main branch]
2022-01-25 14:48:59 -05:00
sebastien lussier
f13b8b863f Landscape Editing - Prevent continuous nav mesh updates when moving the mouse if the Paint - Flatten tool is active
In MouseMove(), MeshComponent->SetRelativeLocation() would trigger the nav mesh update, as the component was bNavigationRelevant
#preflight 61e95a52c32d25dadc2f3980

#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 18673369 in //UE5/Release-5.0/... via CL 18673381 via CL 18673383
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v902-18672795)

[CL 18673386 by sebastien lussier in ue5-main branch]
2022-01-20 08:04:09 -05:00
sebastien lussier
adff39b2c6 #jira UE-137720
Fix crash when switching to the Landscape mode and back to Select mode
#rb jonathan.bard
#preflight 61d85f786c000c869b2d356a

#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 18544948 in //UE5/Release-5.0/... via CL 18544981
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18545049 by sebastien lussier in ue5-release-engine-test branch]
2022-01-07 11:07:56 -05:00
robb surridge
ae0de69a0e Remove user-visible entry points to the tutorial system that are still visible when the system is disabled.
#jira none
#rb lauren.barnes
#preflight 61d5f610db0309127d0a9ccd

#ROBOMERGE-AUTHOR: robb.surridge
#ROBOMERGE-SOURCE: CL 18523553 in //UE5/Release-5.0/... via CL 18523612
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18523651 by robb surridge in ue5-release-engine-test branch]
2022-01-05 15:06:43 -05:00