birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Terrain/sphrose/surface gradient list component (#4409)

Browse Source 
* cherry-pick conflict fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Missed include file

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* cherry-pick merge fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* bug fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* compile fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* compile fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
This commit is contained in:
sphrose
2021-10-05 17:53:05 +01:00
committed by GitHub
parent 36eac35bc3
commit 4a4c93f866
15 changed files with 567 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/SurfaceData/Code/Include/SurfaceData/SurfaceDataConstants.h
+2 -1
View File
@@ -9,12 +9,13 @@
#pragma once
#include <AzCore/Math/Crc.h>
#include <AzFramework/Terrain/TerrainDataRequestBus.h>
namespace SurfaceData
{
namespace Constants
{
static const char* s_unassignedTagName = "(unassigned)";
static const char* s_unassignedTagName = AzFramework::SurfaceData::Constants::s_unassignedTagName;
static const char* s_terrainHoleTagName = "terrainHole";
static const char* s_terrainTagName = "terrain";