Tommy Walton c82f8e43f4 Merge commit 'bc82afa87ac5da739d2b7938242cbdbe4b55dd31' into amzn-tommy/gitflow_211116_o3de2

2021-11-16 12:54:42 -08:00

..

Assets

Fix release build errors on Linux/Mac (#4474)

2021-10-04 11:57:39 -07:00

Builders

Fixing double registration of hair asset

2021-11-13 13:52:56 -06:00

Components

Hair - ShortCut rendering technique and pipeline with Marschner lighting model (#4871)

2021-10-21 14:29:53 -04:00

Passes

Hair - ShortCut rendering technique and pipeline with Marschner lighting model (#4871)

2021-10-21 14:29:53 -04:00

Rendering

AutomatedTesting - adding Hair to MainPipeline (#5200)

2021-11-02 15:38:38 -04:00

HairModule.cpp

Hair - Hair Gem introduction to O3DE from Atom/barlev/AtomTressFX_DevRebase (#4439)

2021-10-04 10:46:31 -04:00

HairModule.h

Hair - Hair Gem introduction to O3DE from Atom/barlev/AtomTressFX_DevRebase (#4439)

2021-10-04 10:46:31 -04:00

HairModuleUnsupported.cpp

Hair - Hair Gem introduction to O3DE from Atom/barlev/AtomTressFX_DevRebase (#4439)

2021-10-04 10:46:31 -04:00