Guthrie Adams 9f65277906 restoring changes lost in merge ...

Signed-off-by: Guthrie Adams <guthadam@amazon.com>

2021-09-15 19:17:33 -05:00

..

Animation

Gems/Atom*

2021-09-10 20:16:11 -07:00

CoreLights

Merge branch 'development' into cmake/warn_virtual

2021-09-14 16:54:52 -07:00

Decals

LYN-4774 Fix missing box icons inside the main Viewport (#2297)

2021-07-21 16:33:04 -07:00

DiffuseGlobalIllumination

LYN-4774 Fix missing box icons inside the main Viewport (#2297)

2021-07-21 16:33:04 -07:00

Grid

LYN-4774 Fix missing box icons inside the main Viewport (#2297)

2021-07-21 16:33:04 -07:00

ImageBasedLights

LYN-4774 Fix missing box icons inside the main Viewport (#2297)

2021-07-21 16:33:04 -07:00

Material

restoring changes lost in merge

2021-09-15 19:17:33 -05:00

Mesh

Gems/Atom*

2021-09-10 20:16:11 -07:00

OcclusionCullingPlane

LYN-4774 Fix missing box icons inside the main Viewport (#2297)

2021-07-21 16:33:04 -07:00

Platform

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

PostProcess

Build time reduction: AzStdOnDemandReflection (#3111)

2021-09-09 19:08:33 -05:00

ReflectionProbe

LYN-4774 Fix missing box icons inside the main Viewport (#2297)

2021-07-21 16:33:04 -07:00

ScreenSpace

LYN-4774 Fix missing box icons inside the main Viewport (#2297)

2021-07-21 16:33:04 -07:00

Scripting

LYN-4774 Fix missing box icons inside the main Viewport (#2297)

2021-07-21 16:33:04 -07:00

SkinnedMesh

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

SkyBox

LYN-4774 Fix missing box icons inside the main Viewport (#2297)

2021-07-21 16:33:04 -07:00

SurfaceData

Remove extra/bad profile markers (#4031)

2021-09-10 09:11:06 -05:00

Thumbnails

ATOM-16063 Remove SetShaderResourceGroupCallback in scene and update scene srg handling (#3969)

2021-09-10 10:38:16 -07:00

CommonFeaturesSystemComponent.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

CommonFeaturesSystemComponent.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

EditorCommonFeaturesSystemComponent.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

EditorCommonFeaturesSystemComponent.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Module.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00