Esteban Papp 5cca52e73c Merge branch 'development' into redcode/driller_removal ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/azcore_files.cmake
#	Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif

2021-12-07 13:31:55 -08:00

..

AuxGeomBase.h

…

AuxGeomDrawProcessorShared.cpp

…

AuxGeomDrawProcessorShared.h

…

AuxGeomDrawQueue.cpp

Merge branch 'development' into redcode/driller_removal

2021-12-07 13:31:55 -08:00

AuxGeomDrawQueue.h

…

AuxGeomFeatureProcessor.cpp

Changes call from AZ_TRACE to AZ_PROFILE. AZ_TRACE uses a driller bus that is going to be removed

2021-12-02 17:12:25 -08:00

DynamicPrimitiveProcessor.cpp

…

DynamicPrimitiveProcessor.h

…

FixedShapeProcessor.cpp

Changes call from AZ_TRACE to AZ_PROFILE. AZ_TRACE uses a driller bus that is going to be removed

2021-12-02 17:12:25 -08:00

FixedShapeProcessor.h

…