birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '673815c58d'
${ noResults }
o3de/Gems/Atom/Feature/Common/Code/Source/Material
History
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
 		4 years ago
..
ConvertEmissiveUnitFunctor.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ConvertEmissiveUnitFunctor.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ConvertEmissiveUnitFunctorSourceData.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
ConvertEmissiveUnitFunctorSourceData.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrawListFunctor.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrawListFunctor.h Gems/Atom 4 years ago
DrawListFunctorSourceData.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
DrawListFunctorSourceData.h Gems/Atom 4 years ago
MaterialAssignment.cpp Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides 4 years ago
MaterialAssignmentId.cpp Fixed the MaterialAssignmentId version converter to properly handle the default material assignment slot. 4 years ago
MaterialAssignmentSerializer.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
MaterialAssignmentSerializer.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
MaterialConverterSystemComponent.cpp Add material property names to material assets, disable FBX dependency on materialtype files. (#3408) 4 years ago
MaterialConverterSystemComponent.h Add material property names to material assets, disable FBX dependency on materialtype files. (#3408) 4 years ago
SubsurfaceTransmissionParameterFunctor.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
SubsurfaceTransmissionParameterFunctor.h Gems/Atom 4 years ago
SubsurfaceTransmissionParameterFunctorSourceData.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
SubsurfaceTransmissionParameterFunctorSourceData.h Gems/Atom 4 years ago
Transform2DFunctor.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Transform2DFunctor.h Gems/Atom 4 years ago
Transform2DFunctorSourceData.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Transform2DFunctorSourceData.h Gems/Atom 4 years ago
UseTextureFunctor.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
UseTextureFunctor.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
UseTextureFunctorSourceData.cpp Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
UseTextureFunctorSourceData.h Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago