Chris Galvan 049b33d2df Merging stabilization/2111RTE -> development, resolved conflicts ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

2022-01-24 15:55:31 -06:00

..

ConvertEmissiveUnitFunctor.cpp

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

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

ConvertEmissiveUnitFunctor.h

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

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

ConvertEmissiveUnitFunctorSourceData.cpp

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

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

ConvertEmissiveUnitFunctorSourceData.h

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

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

DrawListFunctor.cpp

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

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

DrawListFunctor.h

Gems/Atom

2021-09-03 20:35:39 -07:00

DrawListFunctorSourceData.cpp

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

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

DrawListFunctorSourceData.h

Gems/Atom

2021-09-03 20:35:39 -07:00

MaterialAssignment.cpp

extending conversions from script to other numeric types

2021-10-28 13:53:23 -05:00

MaterialAssignmentId.cpp

Fixed the MaterialAssignmentId version converter to properly handle the default material assignment slot.

2021-07-30 11:41:01 -07:00

MaterialAssignmentSerializer.cpp

Temporary fix for material component losing image overrides with prefabs

2021-12-13 11:35:05 -06:00

MaterialAssignmentSerializer.h

Temporary fix for material component losing image overrides with prefabs

2021-12-13 11:35:05 -06:00

MaterialConverterSystemComponent.cpp

First pass at reworking and formalizing the way deferred material asset baking works. The feature basically works but needs more testing.

2022-01-18 10:29:36 -08:00

MaterialConverterSystemComponent.h

First pass at reworking and formalizing the way deferred material asset baking works. The feature basically works but needs more testing.

2022-01-18 10:29:36 -08:00

SubsurfaceTransmissionParameterFunctor.cpp

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

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

SubsurfaceTransmissionParameterFunctor.h

Gems/Atom

2021-09-03 20:35:39 -07:00

SubsurfaceTransmissionParameterFunctorSourceData.cpp

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

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

SubsurfaceTransmissionParameterFunctorSourceData.h

Gems/Atom

2021-09-03 20:35:39 -07:00

Transform2DFunctor.cpp

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

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

Transform2DFunctor.h

Gems/Atom

2021-09-03 20:35:39 -07:00

Transform2DFunctorSourceData.cpp

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

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

Transform2DFunctorSourceData.h

Gems/Atom

2021-09-03 20:35:39 -07:00

UseTextureFunctor.cpp

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

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

UseTextureFunctor.h

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

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

UseTextureFunctorSourceData.cpp

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

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

UseTextureFunctorSourceData.h

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

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