Commit Graph

789 Commits

Author SHA1 Message Date
Chris Gagnon
7de4a4b114 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb chris.gagnon

[CL 8612971 by Chris Gagnon in Dev-Editor branch]
2019-09-10 10:38:54 -04:00
Arne Schober
5758b0a624 MN - Fix compiler error in LandScape due to Robomerge
#RB none

[CL 8576443 by Arne Schober in Main branch]
2019-09-09 16:23:34 -04:00
patrick enfedaque
e2d90bfb0f Fix non-unity build
#rb none
#rnx


#ROBOMERGE-SOURCE: CL 8572139 via CL 8574157
#ROBOMERGE-BOT: (v407-8568993)

[CL 8574359 by patrick enfedaque in Main branch]
2019-09-09 13:52:12 -04:00
jeremy moore
6230f83d8a Support rendering to RVT of landscape spline control points
#ROBOMERGE-SOURCE: CL 8571943 via CL 8574089
#ROBOMERGE-BOT: (v407-8568993)

[CL 8574273 by jeremy moore in Main branch]
2019-09-09 13:51:38 -04:00
patrick enfedaque
8386b2f7fd Landscape Splines:
- Add Noise Texture Modulation to the Painting
- Add Width ratio fo the Painting
- Optimize: Defer Spline Layer Update to avoid doing to much updates when changing multiple properties at the same time

#rb richard.malo


#ROBOMERGE-SOURCE: CL 8571789 via CL 8574054
#ROBOMERGE-BOT: (v407-8568993)

[CL 8574216 by patrick enfedaque in Main branch]
2019-09-09 13:51:18 -04:00
Chris Gagnon
8388cba784 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) prep for copy up.
#rb none

[CL 8573147 by Chris Gagnon in Dev-Editor branch]
2019-09-09 11:59:53 -04:00
Chris Gagnon
6f65d35a7a Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) in prep for copy up
#rb none

[CL 8563299 by Chris Gagnon in Dev-Editor branch]
2019-09-06 19:11:19 -04:00
jeremy moore
bb630dc0f6 Add support to material interface for querying RVT paramters
Stubbed out material instance implementation for now
Use the new interface in RVT parameter material expressions


#ROBOMERGE-SOURCE: CL 8556897 via CL 8562562
#ROBOMERGE-BOT: (v406-8472469)

[CL 8562734 by jeremy moore in Main branch]
2019-09-06 18:57:30 -04:00
JeanFrancois Dube
3a7249f80f Integrate 8417210 from Main: Fix enum typo make condition always false.
#rb none
#lockdown chris.gagnon
#rnx

[CL 8552814 by JeanFrancois Dube in Dev-Editor branch]
2019-09-06 12:40:10 -04:00
juan canada
b42f837508 Add r.RayTracing.Landscape cvar to control if landscapes should be included in ray tracing scene
#rb yujiang.wang
#lockdown cristina.riveron
#jira none

(ushell-p4-cherrypick of 8511781 by Yujiang.Wang)

#ROBOMERGE-SOURCE: CL 8511828 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v406-8472469)

[CL 8511830 by juan canada in Main branch]
2019-09-05 17:56:29 -04:00
patrick enfedaque
2c7196687a Landscape Layers: Fix Crash when passing empty component list (when Landscape.Optim == 1) to the layer render
#rb richard.malo
[FYI] kendall.tucker, robert.osborne


#ROBOMERGE-SOURCE: CL 8503356 via CL 8503912
#ROBOMERGE-BOT: (v406-8472469)

[CL 8509332 by patrick enfedaque in Main branch]
2019-09-05 15:45:33 -04:00
patrick enfedaque
5c0475a1d5 Fix duplicate Segment Mesh after Move to Current Level operation
#rb richard.malo
[FYI] stuart.fitzsimmons
#rnx


#ROBOMERGE-SOURCE: CL 8491410 via CL 8501182
#ROBOMERGE-BOT: (v406-8472469)

[CL 8502544 by patrick enfedaque in Main branch]
2019-09-05 04:37:07 -04:00
patrick enfedaque
6c52399da6 LandscapeLayers: Make sure Intermediate Render used by Flatten/Smooth doesn't dirty Landscape on Read
#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 8480367 via CL 8483752
#ROBOMERGE-BOT: (v406-8472469)

[CL 8483783 by patrick enfedaque in Main branch]
2019-09-04 09:50:36 -04:00
patrick enfedaque
e2aaf5db19 Landscape Layers: Fix LandscapeOptim when components are sharing Heightmaps
#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 8475585 via CL 8477576
#ROBOMERGE-BOT: (v406-8472469)

[CL 8477600 by patrick enfedaque in Main branch]
2019-09-04 08:16:40 -04:00
patrick enfedaque
5e861b4d8a Fix enum typo make condition always false.
#rb none
[FYI] sebastian.nordgren
#rnx


#ROBOMERGE-SOURCE: CL 8416009 via CL 8417195
#ROBOMERGE-BOT: (v404-8404397)

[CL 8417210 by patrick enfedaque in Main branch]
2019-09-03 08:07:55 -04:00
Max Chen
61603c83e4 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL#8390086
#rb none

[CL 8393238 by Max Chen in Dev-Editor branch]
2019-09-01 02:03:35 -04:00
satchit subramanian
4d0f229778 Fix landscape tests.
#ROBOMERGE-SOURCE: CL 8390017 via CL 8390068
#ROBOMERGE-BOT: (v403-8382528)

[CL 8390086 by satchit subramanian in Main branch]
2019-08-31 06:01:20 -04:00
satchit subramanian
9968af12c0 Remove assert in landscape.
#ROBOMERGE-SOURCE: CL 8388266 via CL 8389931
#ROBOMERGE-BOT: (v403-8382528)

[CL 8389941 by satchit subramanian in Main branch]
2019-08-31 02:19:44 -04:00
satchit subramanian
164c9e5e8b Fix landscape non-editor.
#ROBOMERGE-SOURCE: CL 8388243 via CL 8389928
#ROBOMERGE-BOT: (v403-8382528)

[CL 8389939 by satchit subramanian in Main branch]
2019-08-31 02:19:39 -04:00
satchit subramanian
d31d38c2e4 Add back conditions for creating landscape info.
#ROBOMERGE-SOURCE: CL 8388160 via CL 8389863
#ROBOMERGE-BOT: (v403-8382528)

[CL 8389916 by satchit subramanian in Main branch]
2019-08-31 02:18:13 -04:00
satchit subramanian
377fa4fe1b Remove editor assert in landscapeinfo code.
#ROBOMERGE-SOURCE: CL 8387196 via CL 8389599
#ROBOMERGE-BOT: (v403-8382528)

[CL 8389660 by satchit subramanian in Main branch]
2019-08-31 02:03:12 -04:00
satchit subramanian
c133a7b6f5 Compile fixes for landscape - final set (hopefully).
#ROBOMERGE-SOURCE: CL 8386330 via CL 8388876
#ROBOMERGE-BOT: (v403-8382528)

[CL 8389004 by satchit subramanian in Main branch]
2019-08-31 01:33:44 -04:00
patrick enfedaque
c5a4e37065 Landscape Splines: Left/Right Falloff Factor for Layer (split from Height falloff)
#rb richard.malo
[CODEREVIEW] chris.kay


#ROBOMERGE-SOURCE: CL 8386199 via CL 8388677
#ROBOMERGE-BOT: (v403-8382528)

[CL 8388796 by patrick enfedaque in Main branch]
2019-08-31 01:26:07 -04:00
peter knepley
3157b1ef3a Fix non-editor builds
#jira


#ROBOMERGE-SOURCE: CL 8386170 via CL 8388674
#ROBOMERGE-BOT: (v403-8382528)

[CL 8388794 by peter knepley in Main branch]
2019-08-31 01:26:01 -04:00
satchit subramanian
e4d1a67af4 More compile fixes for landscape.
#ROBOMERGE-SOURCE: CL 8385987 via CL 8388659
#ROBOMERGE-BOT: (v403-8382528)

[CL 8388737 by satchit subramanian in Main branch]
2019-08-31 01:24:53 -04:00