Commit Graph

816 Commits

Author SHA1 Message Date
jonathan bard
622e880576 Fixed crash when creating ULandscapeEditorObject's CDO. We don't really care whether the default alpha texture's source data is readable or not at this point.
#rb don.boogert
#jira UE-166677
#preflight 63499cdcce524ed356f8a09c
#rnx

[CL 22546758 by jonathan bard in ue5-main branch]
2022-10-14 22:22:18 -04:00
patrick enfedaque
e64a54f349 Fix failed check (wrong assumption) when merging LandscapeSplineActors
#rb richard.malo
#preflight skip
#rnx

[CL 22546731 by patrick enfedaque in ue5-main branch]
2022-10-14 22:19:59 -04:00
jonathan bard
d51446ba11 * Disabled Layer Info object creation from the asset picker context menu in the Create and the Paint landscape panels.
* Prevented landscape layer info objects to be created when the default landscape layer info object in the project settings is invalid (i.e. it has a path but the asset is missing)

#rb luc.eygasier
#jira UE-166603
#preflight 6348147b8d665d55d0a2d417

[CL 22509740 by jonathan bard in ue5-main branch]
2022-10-13 15:05:52 -04:00
patrick enfedaque
76b3516dd4 LandscapeSpline: While one Control Point is selected on a LandscapeSplineActor, "Ctrl+Click" a Control Point from a different LandscapeSplineActor will merge both actors together.
- Moves the second spline into the first actor and adds a segment between points
- Deletes the second actor

#rb jonathan.bard
#preflight 6347f277b757820b7a30f70e
#rnx

[CL 22507563 by patrick enfedaque in ue5-main branch]
2022-10-13 13:20:10 -04:00
aditya ravichandran
ba72f580d4 Outliner: Update the list of default type filters
Add the ability for other modules to add custom filters to the Level Editor Outliner
#jira UE-165115
#rb Brooke.Hubert
#preflight 6345779f8b06e0aaa0f298e0

[CL 22505460 by aditya ravichandran in ue5-main branch]
2022-10-13 11:35:32 -04:00
jeanfrancois dube
24188090b0 Fix all known cases of GetTypedOuter<UPackage> since it's not valid anymore with override packages.
#rb francis.hurteau
#preflight 633ee7528579446629e2cb5d
#rnx

[CL 22398835 by jeanfrancois dube in ue5-main branch]
2022-10-07 08:12:45 -04:00
jonathan bard
62a0ad4af1 Fixed the 2 places in landscape where we're reading texture data on the CPU and assume that it's valid :
* SplineFalloffModulationTexture for Layer Info Object : we now log an error when applying the change and don't apply modulation in case the texture data is invalid
* AlphaTexture for the alpha brush : we now log an error when setting the texture and revert to the default texture in case the texture data is invalid

Misc:
* Fixed undo/redo for Layer Info Object not triggering an update of the landscape splines

#rb don.boogert
#jira UE-162111
#preflight 633b4aa8ef773945652ac746

[CL 22366349 by jonathan bard in ue5-main branch]
2022-10-05 19:15:18 -04:00
joe pribele
0574fc6d7a removed usage of TObjectPtr.IsNull and IsNullNoResolve
#rb zousar.shaker
#p4v-preflight-copy 22193787

[CL 22361481 by joe pribele in ue5-main branch]
2022-10-05 15:34:23 -04:00
jonathan bard
3b070b1ede Fixed ensure in Chaos when LandscapeFlatten tool is used with an invalid mouse position (e.g. while working in RDP)
#jira UE-164952
#preflight trivial
#rb luc.eygasier
#rnx

[CL 22179023 by jonathan bard in ue5-main branch]
2022-09-26 05:49:44 -04:00
michael balzer
6d9c418879 Landscape: Limit "Fill World" in restrictive mode to 2k x 2k
#preflight 632bb02ec7791417aa5a53d5

[CL 22173127 by michael balzer in ue5-main branch]
2022-09-24 13:29:38 -04:00
bryan sefcik
892629fe83 Fixed some paths that got updated to include the full "ThirdParty" path.
#jira
#preflight 6320877bbc40358fa2995069

[CL 21997782 by bryan sefcik in ue5-main branch]
2022-09-13 21:48:33 -04:00
patrick enfedaque
5ce0c83b58 Landscape Dirtyness
- New CVar 'landscape.DirtyOnlyInMode' when enabled, modifications to the landscape that happen outside of the Landscape Edit Mode (Modifications affecting the Edit Layers like Water brush) will be tracked but packages will not be marked dirty.
- Users can use the Build > Save Modified Landscapes to save those collateral changes.

#jira UE-158840
#rb richard.malo, jonathan.bard
#preflight 63206a3da514fd1e37bfd0ec

[CL 21989552 by patrick enfedaque in ue5-main branch]
2022-09-13 15:01:53 -04:00
bryan sefcik
b93a6cf7ed Pass 1 on editor include fixes:
Removed redundant private include paths from build.cs files.
Fixed include paths to be relative to the private or public folders.
Hid or removed includes that reached into other private module folders.
Updated PublicInclude paths when necessary.

#jira
#preflight 631e283bec5b0c765fc0ffdb

[CL 21960084 by bryan sefcik in ue5-main branch]
2022-09-11 18:33:06 -04:00
jonathan bard
06a4f233bb Fixed keyboard shortcuts for landscape paint brush
#rb chris.tchou
#jira UE-162793
#rnx

[CL 21746056 by jonathan bard in ue5-main branch]
2022-09-01 15:40:57 -04:00
don boogert
83f017fda3 Landscape : separate tool falloff, size & strength values for paint & sculpt
* Implemented as new Paint  falloff, size & strength members on ULandscapeEditorObject. Doing it this way made it was easier to persist the values different values for paint & sculpt when exiting & re-entering landscape mode.
* Perhaps there are other parameters which could be separated out between paint & sculpt but I hope brush size, strength & falloff are sufficient to make the workflow smoother.

#jira UE-142018
#rb jonathan.bard
#preflight 630f95c4e54ec9d581b23f78

[CL 21724189 by don boogert in ue5-main branch]
2022-08-31 13:40:30 -04:00
don boogert
0b0f67917e Landscape: Order Landscape Details UI Categories
#jira UE-162418
#rb jonathan.bard
#preflight 630d5fb7a416f6df25c5444a

[CL 21715248 by don boogert in ue5-main branch]
2022-08-30 21:38:23 -04:00
jonathan bard
a517cf4895 Fixed viewport not updating when switching landscape visualization modes
#rb roey.borsteinas
#preflight 630e3663e352708d441d72f4

[CL 21709945 by jonathan bard in ue5-main branch]
2022-08-30 17:20:37 -04:00
bryan sefcik
8cc129f2b6 IWYU Pass 1 - Engine/Source/Editor/...
#jira
#preflight 6306736ac85b7fef22be7751

[CL 21558583 by bryan sefcik in ue5-main branch]
2022-08-24 22:45:13 -04:00
roey borsteinas
dd2576c96a Landscape: fix for nullptr dereference of CurrentTool in static analysis
#rb jonathan.bard

[CL 21553214 by roey borsteinas in ue5-main branch]
2022-08-24 17:38:12 -04:00
roey borsteinas
4c15018624 Landscape: Correctly implemented GetReferencerName for all landscape tools.
#rb jonathan.bard

[CL 21527188 by roey borsteinas in ue5-main branch]
2022-08-23 20:06:26 -04:00
don boogert
3f1594a6dc #jira UE-148580
* Fixed single file export for heightmap/weightmaps
* Added option to export to single file for grid-based worlds
* Fixed a problem where you couldn't import a single heightmap/weightmap file if it was named with the same prefix as the grid-based ones located in the same folder (e.g. Heightmap.png with Heightmap_x0_y0.png, etc. being present in the same folder)
* fixed crash if file pattern resulted in no files
* set import gizmo to location of last export

#ushell-cherrypick of 19676938 by jonathan.bard
#rb don.boogert
#preflight 6303c090c744dac967a93217

[CL 21492627 by don boogert in ue5-main branch]
2022-08-22 16:37:33 -04:00
Nickolas Drake
c95b943484 Landscape Edit Layers: Add edit layer insertion modal dialog and ILandscapeEditorServices. Implement high level GetOrCreateEditLayer(FName InEditLayerName, ALandscape* InTargetLandscape) which allows for custom layer creation logic. Default logic returns layer index if matching layer is found, otherwise creates the layer and prompts the user with a dialog to choose how to insert the new layer.
#jira UE-157674
#rb jonathan.bard
#preflight 6303dd75fa1ac183e5f64663

[CL 21492408 by Nickolas Drake in ue5-main branch]
2022-08-22 16:30:55 -04:00
patrick enfedaque
dcc0c05bf7 FLandscapeToolFlatten: null out component ptr when exiting tool (Fix GC Leak)
#rb jeanfrancois.dube
[FYI] chris.kay
#preflight skip

#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 21335669 via CL 21335677 via CL 21335683
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21337318 by patrick enfedaque in ue5-main branch]
2022-08-11 11:40:10 -04:00
don boogert
72f9932a3d Landscape: Allow painting on the edges of landscape components
#jira UE-140539
#rb jonathan.bard
#preflight 62d97f00d76ea4b503cc434f

[CL 21211009 by don boogert in ue5-main branch]
2022-07-21 17:56:46 -04:00
luc eygasier
8bb3434227 Cleans Landscape Visibility Layer behavior in Landscape Editor:
* Fixes Visibility Layer Info Object being created when a default Layer Info Object is set
* Fixes Visibility Layer being displayed twice in the visibility tool
* Removes Visibility Layer from New Landscape Tool
* Removes Visibility Layer from Paint tool
* Adds Visibility Layer in Import/Export tool so it can be imported/exported

#rb Jonathan.Bard
#preflight 62d0207c3c3df32390da515a

#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 21094274 via CL 21094303 via CL 21097217 via CL 21097497
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21106206 by luc eygasier in ue5-main branch]
2022-07-15 03:39:08 -04:00