nvsickle ea3adc8405 Fix several merge conflicts and auto-formatting issues

2021-06-18 13:41:59 -07:00

..

Asset

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

Buffer

ATOM-15658 Better option of CreateCommonBuffer requires unique buffer name (#1133)

2021-06-04 10:28:56 -07:00

Image

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

Material

Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18

2021-06-18 13:25:53 -07:00

Model

ensure brute force ray intersection works (#1170)

2021-06-08 19:44:33 +01:00

Pass

Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00

Shader

Fix several merge conflicts and auto-formatting issues

2021-06-18 13:41:59 -07:00

System

Initial commit

2021-03-08 14:30:57 -08:00

Base.cpp

ATOM-15252 [Atom 0.8.5] Track View capture crashes when scene contains certain postfx

2021-04-16 09:47:03 -07:00

FeatureProcessorDescriptor.cpp

Initial commit

2021-03-08 14:30:57 -08:00

GpuQuerySystemDescriptor.cpp

Initial commit

2021-03-08 14:30:57 -08:00

ResourcePoolAsset.cpp

Initial commit

2021-03-08 14:30:57 -08:00

ResourcePoolAssetCreator.cpp

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

RPISystemDescriptor.cpp

[ATOM-15472] Shader Build Pipeline: Remove Deprecated Files And Funct… (#1079)

2021-06-11 07:48:23 -05:00