Commit Graph

97 Commits

Author SHA1 Message Date
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
jonathan bard
32bdd63a8c Fixed static analysis
#rb patrick.enfedaque
#jira UE-113235
#robomerge[RELEASE] Main
#robomerge[BOT1] Main

[CL 15987710 by jonathan bard in ue5-main branch]
2021-04-13 06:48:42 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
Zousar Shaker
a160958acf Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr)
Avoiding use of implicit conversion to pointer reference on TObjectPtr (making it either explicit or using a reference to a TObjectPtr where that is an easy option).

#rb matt.peters

[CL 14840803 by Zousar Shaker in ue5-main branch]
2020-12-02 20:23:02 -04:00
Zousar Shaker
3cdeeb8075 Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr) Change ternary operators that are ambiguous when TObjectPtr can be implicitly constructed from a raw pointer. Also allow TObjectPtr to be implicitly constructed from an appropriate raw pointer.
#rb devin.doucette

[CL 14739879 by Zousar Shaker in ue5-main branch]
2020-11-12 18:18:02 -04:00
Patrick Enfedaque
07ab6ed7dd Landscape: Fix Async Texture Compile Crashes/Bugs
#jira UE-96527
#rb richard.malo
#fyi danny.couture

[CL 14113946 by Patrick Enfedaque in ue5-main branch]
2020-08-14 11:34:13 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
patrick enfedaque
b005c6adfd Fix bad buffersize calculation leading to corrupt landscape edit (Case: heightmap Width != Height)
#rb richard.malo
[FYI] pat.jones
#rnx


#ROBOMERGE-SOURCE: CL 11445490 via CL 11445493 via CL 11445499
#ROBOMERGE-BOT: (v654-11333218)

[CL 11445502 by patrick enfedaque in Main branch]
2020-02-14 12:42:42 -05:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
patrick enfedaque
5d4cdff99d Landscape Layers: PostLoad Fixup Weightmap code not supporting Layers.
#rb richard.malo
[FYI] stuart.fitzsimmons
#rnx


#ROBOMERGE-SOURCE: CL 10811045 via CL 10811048 via CL 10811050
#ROBOMERGE-BOT: (v610-10636431)

[CL 10811052 by patrick enfedaque in Main branch]
2019-12-19 11:22:31 -05:00
patrick enfedaque
2b99cc032a Remove FlushRenderingCommands
- When uploading TextureEdits to GPU (double buffer)
- When invalidating lighting cache. (dependency has already been removed a while ago with the MapBuildData changes)

Move InvalidateLightingCache calls to the resolve (like all the other client code ex: Coll, Foliage, etc)

#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 10761011 via CL 10761012
#ROBOMERGE-BOT: (v610-10636431)

[CL 10761013 by patrick enfedaque in Main branch]
2019-12-17 07:56:42 -05:00
patrick enfedaque
c315fdb794 Wrap Channel and Texture index + Prevent crash caused by incoming CL in QA Landscape map when switching Landscape to Edit Layers
#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 10760821 via CL 10760822
#ROBOMERGE-BOT: (v610-10636431)

[CL 10760823 by patrick enfedaque in Main branch]
2019-12-17 06:19:09 -05:00
patrick enfedaque
c1cda00c02 Landscape Visibility Painting: Fix tool so Visibility can be painted even if some Landscape actors don't have a Hole Material set. (check per component)
#rb richard.malo
[FYI] robert.osborne


#ROBOMERGE-SOURCE: CL 10708346 via CL 10713361
#ROBOMERGE-BOT: (v610-10636431)

[CL 10713537 by patrick enfedaque in Main branch]
2019-12-13 14:22:46 -05:00
patrick enfedaque
cad83950c0 Landscape Layers: Rework Dirty Debug (tool to investigate map dirtyness on load)
#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 10611334 via CL 10613402
#ROBOMERGE-BOT: (v608-10590470)

[CL 10613410 by patrick enfedaque in Main branch]
2019-12-09 13:36:08 -05:00
jonathan bard
c77ff0d728 Fixed crash when creating a layer info on a list of layers with none assigned yet
#rb patrick.enfedaque
#jira UE-81722
#rnx

#robomerge[RELEASE] Release-4.24

#ROBOMERGE-SOURCE: CL 9966755 via CL 9966756
#ROBOMERGE-BOT: (v560-9963197)

[CL 9967287 by jonathan bard in Main branch]
2019-11-04 09:55:18 -05:00
patrick enfedaque
0abcbececd Landscape Layers: Collapse Feature
#rb richard.malo
[FYI] robert.osborne


#ROBOMERGE-SOURCE: CL 9900591 via CL 9902472
#ROBOMERGE-BOT: (v558-9892490)
#robomerge[RELEASE] Release-4.24

[CL 9906338 by patrick enfedaque in Main branch]
2019-10-31 13:23:42 -04:00
patrick enfedaque
9877e2e167 Landscape Layers: Fix Crash when Clearing Weightmaps
#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 9596214 via CL 9596237
#ROBOMERGE-BOT: (v526-9587114)

[CL 9596250 by patrick enfedaque in Main branch]
2019-10-15 13:16:16 -04:00
patrick enfedaque
1954813da6 Landscape Layers: Debugging Features
- CVar: Landscape.OutputDiffBitmap (=1 Heightmap, =2 Weightmap, =3 Both)
- CVar: Landscape.ShowDirty new view mode that shows dirtied data since last clear
- Console Command: Landscape.ClearDirty

#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 9093341 via CL 9093343 via CL 9093354
#ROBOMERGE-BOT: (v443-9013191)

[CL 9093357 by patrick enfedaque in Main branch]
2019-09-25 09:10:47 -04:00
patrick enfedaque
efd980eeb9 Landscape Layers:
- Add Hashing support so that Splines & Brushes do not need to dirty all the levels when they run (we still have issues with the WaterBrushManager not outputting deterministic results for Weightmaps)
- Invalidation of Grass is now based on the resulting hash changing per component.

#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 7851111 via CL 7865953
#ROBOMERGE-BOT: (v389-7813075)

[CL 7866367 by patrick enfedaque in Main branch]
2019-08-08 05:17:19 -04:00
richard malo
66ab638aff Optimized update of collision Heightfield region when painting.
Greatly improves performance when painting in landscape with big compoments.
#rb patrick.enfedaque
#rnx


#ROBOMERGE-SOURCE: CL 7613912 via CL 7621192
#ROBOMERGE-BOT: (v372-7473910)

[CL 7621298 by richard malo in Main branch]
2019-07-24 20:21:46 -04:00
richard malo
c6442c8afe Increased precision of alpha blending value used by landscape splines when using Landscape Layer system (from 8-bits to 14-bits). This solves stippled effect on spline side falloffs at higher locations.
#rb patrick.enfedaque
#rnx


#ROBOMERGE-SOURCE: CL 7603450 via CL 7608753
#ROBOMERGE-BOT: (v372-7473910)

[CL 7608877 by richard malo in Main branch]
2019-07-24 12:15:09 -04:00
patrick enfedaque
8e7cdb8b01 Fix crash when creating new Landscape (with Layers) and specifying any LayerInfo (doesn't have import weight data in this code path)
[FYI] richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 7325030 via CL 7329775
#ROBOMERGE-BOT: (v371-7306989)

[CL 7330003 by patrick enfedaque in Main branch]
2019-07-16 21:11:41 -04:00
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00