mrieggeramzn 76de21940d Fixup merge ...

Signed-off-by: mrieggeramzn <mriegger@amazon.com>

2021-10-01 13:29:52 -07:00

..

AsyncLoadTracker.h

more fixes

2021-08-20 10:09:44 -07:00

DecalFeatureProcessor.cpp

[development] Atom CPU profiler include cleanup (#4272)

2021-09-23 11:14:22 -07:00

DecalFeatureProcessor.h

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

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

DecalTextureArray.cpp

Atom/mriegger/decalnormalmaps (#4302)

2021-09-30 15:34:12 -07:00

DecalTextureArray.h

Atom/mriegger/decalnormalmaps (#4302)

2021-09-30 15:34:12 -07:00

DecalTextureArrayFeatureProcessor.cpp

Fixup merge

2021-10-01 13:29:52 -07:00

DecalTextureArrayFeatureProcessor.h

Improvements. You can now call SetDecalMaterial() with any permutation and it works as expected

2021-10-01 13:03:52 -07:00