Commit Graph

335 Commits

Author SHA1 Message Date
richard malo
ea457f7eac - Support reorder of landscape layers
[CODEREVIEW] patrick.enfedaque
[FYI] michael.dupuis


#ROBOMERGE-SOURCE: CL 5747456 via CL 5750272

[CL 5750430 by richard malo in Main branch]
2019-04-04 17:18:05 -04:00
richard malo
6d50a78ae6 - Limited support of Flatten & Ramp Tool for Landscape Layer System (limited to first layer)
- Disabled Retopologize Landscape Tool for Landscape Layer System
- Erosion & HydroErosion Tool now supported Landscape Layer System
- Added message tip to show warnings of unsupported edition cases in the Landscape Layer System
- Fixed bug in Renaming of a Landscape Layer
#rb michael.dupuis
[CODEREVIEW] michael.dupuis
[FYI] patrick.enfedaque


#ROBOMERGE-SOURCE: CL 5743264 via CL 5745866

[CL 5746001 by richard malo in Main branch]
2019-04-04 14:05:33 -04:00
richard malo
252770fc84 - Landscape Splines can now reserve a Landscape Layer (using the Landscape Layer System). In that use-case, their terraforming/terrapainting becomes non-destructive.
- Added automatic update of landscape deformation when landscape splines are modified (only in Landscape Layer System Mode)
- Added a new blend mode (alpha blend) to allow landscape splines to blend with previous landscape layers (blending and raise/lower flags is handled by GPU)
#rb michael.dupuis
[CODEREVIEW] michael.dupuis
[FYI] patrick.enfedaque


#ROBOMERGE-SOURCE: CL 5734202 via CL 5736580

[CL 5736607 by richard malo in Main branch]
2019-04-04 09:55:19 -04:00
Michael Dupuis
e4279d2bd6 Fixed compilation error
#jira UE-72091
#rb none

[CL 5634594 by Michael Dupuis in Main branch]
2019-03-28 15:25:57 -04:00
Michael Dupuis
1b4f8cbbf5 Changed the name from Landscape Procedural to Landscape Layers
Moved some function from LandscapeEdMode to LandscapeEditLayers

#jira UE-61718
#rb none
[CODEREVIEW] Richard.Malo


#ROBOMERGE-OWNER: Michael.Dupuis
#ROBOMERGE-AUTHOR: michael.dupuis
#ROBOMERGE-SOURCE: CL 5629413 via CL 5631899

[CL 5632451 by Michael Dupuis in Main branch]
2019-03-28 13:48:03 -04:00
richard malo
80f79a036d Removed usage of Procedural Layer's name as key in Landscape Procedural Layer system (ULandscapeWeightmapUsage, ALandscapeProxy's ProceduralLayersData map, ULandscapeComponent's CurrentProceduralLayer) and use Layer's Guid instead.
[CODEREVIEW] michael.dupuis
#rb michael.dupuis


#ROBOMERGE-SOURCE: CL 5501331 via CL 5501540

[CL 5501542 by richard malo in Main branch]
2019-03-22 10:15:11 -04:00
richard malo
be327ea444 Added basic Procedural Layer management (Create New Layer, Delete Layer, Lock/Unlock Layers, Toggle/Isolate Layer Visibility)
[CODEREVIEW] michael.dupuis
#rb michael.dupuis


#ROBOMERGE-SOURCE: CL 5491687 via CL 5491921

[CL 5491930 by richard malo in Main branch]
2019-03-21 09:05:32 -04:00
michael dupuis
309445c2d1 Fixed WeightmapUsage crash caused by doing an Undo and using a newed ptr in a TMap that was transacted
#rb Richad.Malo
[CODEREVIEW] Richard.Malo


#ROBOMERGE-SOURCE: CL 5488124 via CL 5489740

[CL 5489807 by michael dupuis in Main branch]
2019-03-20 21:07:52 -04:00
michael dupuis
a16e0aef6d When SetParentEditorOnly is called we no longer recompute shader in most case as we will call UpdateStaticPermutation that will do so.
Add Procedural Layer support for Weightmaps, including Brush support that affect Weightmap and/or Heightmap.

#jira UE-61718:
#rb Jack.Porter
[FYI] Jeremy.Moore, Richard.Malo


#ROBOMERGE-SOURCE: CL 5433816 via CL 5437700

[CL 5437807 by michael dupuis in Main branch]
2019-03-18 18:04:55 -04:00
robert osborne
66043a94cd #ROBOMERGE-SOURCE: CL 5399925 via CL 5401157
[CL 5402217 by robert osborne in Main branch]
2019-03-14 17:20:06 -04:00
christina tempelaarl
17151b9756 Fixed Landscape Spline Tangent handles.
#rb matt.kuhlenschmidt


#ROBOMERGE-SOURCE: CL 5398472 via CL 5398856

[CL 5398863 by christina tempelaarl in Main branch]
2019-03-14 12:36:10 -04:00
christina tempelaarl
ad395bd774 Fix crash creating new landscape spline.
#rb matt.kuhlenschmidt


#ROBOMERGE-SOURCE: CL 5352884 via CL 5354856

[CL 5354947 by christina tempelaarl in Main branch]
2019-03-08 18:43:26 -05:00
richard malo
de413de67e Fixed Landscape's Copy/Paste Tool
#jira UE-71015
[CODEREVIEW] michael.dupuis
#rb michael.dupuis
#rnx

#ROBOMERGE-SOURCE: CL 5336881 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5337904 by richard malo in Main branch]
2019-03-07 11:44:38 -05:00
michael dupuis
dc0ad87364 Added missing landscape actor check
#jira UE-71021
#rb none
[FYI] jack.porter

#ROBOMERGE-SOURCE: CL 5311962 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5314684 by michael dupuis in Main branch]
2019-03-06 12:44:33 -05:00
christina tempelaarl
a0ee7694e5 Add Alt-Drag functionality to Landscape Splines for duplicating control points.
#rb matt.kuhlenschmidt
[FYI] paul.mader, robert.osborne, jordan.walker


#ROBOMERGE-SOURCE: CL 5235789 via CL 5239449

[CL 5239549 by christina tempelaarl in Main branch]
2019-02-28 11:52:27 -05:00
michael dupuis
130fabe39e Fixed the error is size calculation for raw format (.r8) of weightmap
#jira UE-69730
#rb Richard.Malo
[FYI] Jack.Porter

#ROBOMERGE-SOURCE: CL 5110788 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5206578 by michael dupuis in Main branch]
2019-02-26 16:16:59 -05:00
Michael Dupuis
07d53d31db Tried to share the FMaterialUpdateContext & FRecreateRenderState as much as possible, to prevent many recreation of the graphic scene. This was done to improve the performance of Change Component Settings, and would also have some impact on other things like DeleteComponent, moving component to another level, creating a new landscape, etc.
The change also include a merge from DevMain to improve the perf of UpdateMaterialInstance

#jira none
#rb Jack.Porter, Uriel.Doyon
[FYI] Jeremy.Moore

[CL 5045490 by Michael Dupuis in Main branch]
2019-02-18 14:37:22 -05:00
michael dupuis
ea63325af5 #rb none
[CODEREVIEW] jack.porter


#ROBOMERGE-SOURCE: CL 4935720 via CL 4940201

[CL 4941477 by michael dupuis in Main branch]
2019-02-07 20:56:17 -05:00
Marcus Wassmer
fee98d3ca5 Merging //UE4/Dev-Main@4729937 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4730169 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:30:06 -05:00
Marcus Wassmer
a8d6cc952b Merging //UE4/Dev-Main@4700769 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4729861 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:04:38 -05:00
Marcus Wassmer
834e95f3d3 Merging //UE4/Dev-Main@4680011 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4680455 by Marcus Wassmer in Dev-Rendering branch]
2019-01-03 19:28:34 -05:00
Marcus Wassmer
cbfcbbb93b Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
Should be just copyright updates

[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
2019-01-03 19:16:26 -05:00
Marcus Wassmer
b5d7db3689 Copying //UE4/Dev-Rendering-HLR@4650617 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4651635 by Marcus Wassmer in Dev-Rendering branch]
2018-12-11 22:25:04 -05:00
Marcus Wassmer
c56a69a8c0 Merging //UE4/Dev-Main@4567547 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4568017 by Marcus Wassmer in Dev-Rendering branch]
2018-11-14 21:37:16 -05:00
Marc Audy
af90b7bcd4 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00