10a8780e6f
Merge branch 'main' into Atom/dmcdiar/ATOM-14951
...
# Conflicts:
# Gems/Atom/Feature/Common/Assets/Passes/OpaqueParent.pass
# Gems/Atom/Feature/Common/Assets/Passes/ReflectionGlobalFullscreen.pass
# Gems/Atom/Feature/Common/Assets/Passes/Reflections.pass
# Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassOutput.azsli
# Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen.azsl
2021-04-22 21:49:21 -07:00
f2a757f21e
Merge branch 'main' into Atom/dmcdiar/ATOM-14951
2021-04-20 02:50:03 -07:00
fd8b42c45e
Merge branch 'main' into non-uniform-scale-mesh
2021-04-20 10:29:55 +01:00
f0ae8056c8
feedback from PR
2021-04-20 10:25:19 +01:00
e497b7ac33
Merge branch 'main' into non-uniform-scale-mesh
2021-04-19 11:05:10 +01:00
a4fe1bc8db
Removed ClearCoatNormal RT from the pipeline and shaders.
...
Changed stencil bits to use 0x3 for the IBL Specular pass and 0x80 for the DiffuseGI pass.
2021-04-18 23:07:29 -07:00
8fead27c45
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
...
Remove option from presets
Updated code to select current default options
Will data drive default options with editor settings or settings registry in upcoming tasks
https://jira.agscollab.com/browse/ATOM-13950
2021-04-18 12:12:32 -05:00
8378f52ba6
Fix bug in ShaderVariantAssetBuilder. Add cvar in MeshDrawPacket class. ( #61 )
...
Fix bug in ShaderVariantAssetBuilder. Add a console variable to force root shader variant usage.
2021-04-16 12:06:05 -07:00
d8169e08fb
merging from main
2021-04-15 08:18:11 +01:00
2fb2813b48
updating atom mesh component to support non-uniform scale component
2021-04-14 14:05:59 +01:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
dmcdiar
greerdv
guthadam
hershey5045
alexpete