Chris Santora
33745fdad1
Note there were significant conflicts in LightingModel.azsli and StandardPBR_ForwardPass.azsl. I only did basic resolves of these conflicts, mostly preserving the changes from main and distarding the changes in the local branch. The shaders are not compiling at this point, and of course the tests are not passing. I will fix up the code to make corrections in a separate commit, to make it easier to review those changes separate from this merge.
Atom test projects should include Gems\Atom\TestData in their Asset Processor "ScanFolder" list, like this: [ScanFolder AtomTestData] watch=@ENGINEROOT@/Gems/Atom/TestData recursive=1 order=1000 The reason we have a second "TestData" folder inside this one is to make it very clear that the corresponding assets in the cache are from the TestData folder. For example, the asset path at runtime will be like "testdata/objects/cube.azmodel" instead of "objects/cube.azmodel".