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 '1e67b35a98'
${ noResults }
o3de/Gems/Atom/Feature/Common/Code/Source/Material
History
santorac b5c7869f14 Merge branch 'development' into Atom/santorac/RemixableMaterialTypes3 
There were lots of material system conflicts that had to be resolved. I expect the build is broken at this commit, and I'll fix it in followup commits.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 		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 Renamed m_groups and m_properties to have "Old" in the name for clarity. 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 extending conversions from script to other numeric types 4 years ago
MaterialAssignmentId.cpp Fixed the MaterialAssignmentId version converter to properly handle the default material assignment slot. 4 years ago
MaterialAssignmentSerializer.cpp Temporary fix for material component losing image overrides with prefabs 4 years ago
MaterialAssignmentSerializer.h Temporary fix for material component losing image overrides with prefabs 4 years ago
MaterialConverterSystemComponent.cpp First pass at reworking and formalizing the way deferred material asset baking works. The feature basically works but needs more testing. 4 years ago
MaterialConverterSystemComponent.h First pass at reworking and formalizing the way deferred material asset baking works. The feature basically works but needs more testing. 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