Guthrie Adams 4c9f456ea5 Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides ...

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

# Conflicts:
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp

2021-09-29 13:31:23 -05: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

Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides

2021-09-29 13:31: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

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

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

MaterialAssignmentSerializer.h

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

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

MaterialConverterSystemComponent.cpp

Add material property names to material assets, disable FBX dependency on materialtype files. (#3408)

2021-09-01 16:01:33 -07:00

MaterialConverterSystemComponent.h

Add material property names to material assets, disable FBX dependency on materialtype files. (#3408)

2021-09-01 16:01:33 -07: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